New Template Settings Applied Incorrectly

When creating a new server template (either empty or copying from default), the settings are incorrectly applied to the Default Settings template instead of the new template.

For example, if I create a new template called "test", scroll down to the Administration user, set the "Default quota for mail users" to 10 MB, and save. When I go back and look at this setting in the new "test" template, it just refers to "From default settings". And if I look at the Default Settings, it has been changed to 10 MB.