diff --git a/lib/WebGUI/Mailing.pm b/lib/WebGUI/Mailing.pm
index 2e8d604..1591e9c 100644
--- a/lib/WebGUI/Mailing.pm
+++ b/lib/WebGUI/Mailing.pm
@@ -590,15 +590,15 @@ sub www_editSave {
 
     my %fields          = %{ $self->getAsset->getMailingProperties( $self ) };
     my $configuration   = {}; 
-    if ( $self->admin->canOverride ) {
-       while ( my( $name, $properties ) = each %fields ) {
-           my $value = $form->process( $name, $properties->{ fieldType }, $properties->{ defaultValue } );
+    while ( my( $name, $properties ) = each %fields ) {
+        if ( $self->admin->canOverride ) {
+            my $value = $form->process( $name, $properties->{ fieldType }, $properties->{ defaultValue } );
 
-           $configuration->{ $name } = $value;
-       }
-    }
-    else { 
-        $configuration = \%fields;
+            $configuration->{ $name } = $value;
+        }
+        else {
+            $configuration->{ $name } = $properties->{ defaultValue } || $properties->{ value };
+        }
     }
     
     #### TODO: Add error checking and required fields?