diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index fd342569e..d1f5b3319 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -454,7 +454,7 @@ sub definition {
         tab             => "user",
         name            => "showMessageOnLogin",
         fieldType       => "yesNo",
-        defaultValue    => 0,
+        defaultValue    => $setting->get('showMessageOnLoginTimes'),
         label           => $i18n->get( 'showMessageOnLogin label' ),
         hoverHelp       => $i18n->get( 'showMessageOnLogin description' ),
     };
@@ -462,7 +462,7 @@ sub definition {
         tab             => "user",
         name            => "showMessageOnLoginTimes",
         fieldType       => "integer",
-        defaultValue    => 1,
+        defaultValue    => $setting->get('showMessageOnLoginTimes'),
         label           => $i18n->get( 'showMessageOnLoginTimes label' ),
         hoverHelp       => $i18n->get( 'showMessageOnLoginTimes description' ),
     };
@@ -480,6 +480,7 @@ sub definition {
         fieldType       => 'HTMLArea',
         label           => $i18n->get( 'showMessageOnLoginBody label' ),
         hoverHelp       => $i18n->get( 'showMessageOnLoginBody description' ),
+        defaultValue    => $setting->get('showMessageOnLoginBody'),
     };
     push @fields, {
         tab             => "user",