diff --git a/lib/WebGUI/Authentication/WebGUI.pm b/lib/WebGUI/Authentication/WebGUI.pm
index 2b392c23b..6f772a634 100644
--- a/lib/WebGUI/Authentication/WebGUI.pm
+++ b/lib/WebGUI/Authentication/WebGUI.pm
@@ -70,6 +70,9 @@ sub registrationForm {
 
 #-------------------------------------------------------------------
 sub registrationFormSave {
+	my $authInfo = "\n\n".WebGUI::International::get(50).": ".$session{form}{"authWebGUI.username"}."\n"
+        	.WebGUI::International::get(51).": ".$session{form}{'authWebGUI.identifier'}."\n\n";
+        WebGUI::MessageLog::addEntry($_[0],"",WebGUI::International::get(870),$session{setting}{welcomeMessage}.$authInfo);
 	adminFormSave($_[0]);
 }
 
@@ -99,7 +102,20 @@ sub registrationFormValidate {
 
 #-------------------------------------------------------------------
 sub settingsForm {
-	return "";
+	my $f = WebGUI::HTMLForm->new;
+	$f->readOnly('<b>'.optionsLabel().'</b>');
+	$f->yesNo(
+                -name=>"sendWelcomeMessage",
+                -value=>$session{setting}{sendWelcomeMessage},
+                -label=>WebGUI::International::get(868)
+                );
+        $f->textarea(
+                -name=>"welcomeMessage",
+                -value=>$session{setting}{welcomeMessage},
+                -label=>WebGUI::International::get(869)
+                );
+        $f->textarea("recoverPasswordEmail",WebGUI::International::get(134),$session{setting}{recoverPasswordEmail});
+	return $f->printRowsOnly;
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Operation/Account.pm b/lib/WebGUI/Operation/Account.pm
index 50491b4f8..8cb972d0b 100644
--- a/lib/WebGUI/Operation/Account.pm
+++ b/lib/WebGUI/Operation/Account.pm
@@ -185,7 +185,6 @@ sub www_createAccountSave {
 		}
                 WebGUI::Session::start($u->userId);
 		_logLogin($u->userId,"success");
-		WebGUI::MessageLog::addEntry($u->userId,"",WebGUI::International::get(870),$session{setting}{welcomeMessage});
 		system(WebGUI::Macro::process($session{setting}{runOnRegistration})) if ($session{setting}{runOnRegistration} ne "");
 		WebGUI::MessageLog::addInternationalizedEntry('',$session{setting}{onNewUserAlertGroup},'',536) if ($session{setting}{alertOnNewUser});
         } else {
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index a695335b2..fd6635178 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -49,9 +49,9 @@ sub www_editUserSettings {
         $f->yesNo("useKarma",WebGUI::International::get(539),$session{setting}{useKarma});
         $f->integer("karmaPerLogin",WebGUI::International::get(540),$session{setting}{karmaPerLogin});
         $f->interval("sessionTimeout",WebGUI::International::get(142),WebGUI::DateTime::secondsToInterval($session{setting}{sessionTimeout}));
-        $f->select("authMethod",$session{authentication},WebGUI::International::get(119),[$session{setting}{authMethod}]);
         #$f->yesNo("usernameBinding",WebGUI::International::get(306),$session{setting}{usernameBinding});
 	$f->yesNo("selfDeactivation","Allow users to deactivate their account",$session{setting}{selfDeactivation});
+        $f->select("authMethod",$session{authentication},WebGUI::International::get(119),[$session{setting}{authMethod}]);
 	foreach (keys %{$session{authentication}}) {
 		$f->raw(WebGUI::Authentication::settingsForm($_));
  	}
@@ -115,17 +115,6 @@ sub www_editMessagingSettings {
 	$f = WebGUI::HTMLForm->new;
         $f->hidden("op","saveSettings");
         $f->text("smtpServer",WebGUI::International::get(135),$session{setting}{smtpServer});
-	$f->yesNo(
-		-name=>"sendWelcomeMessage",
-		-value=>$session{setting}{sendWelcomeMessage},
-		-label=>WebGUI::International::get(868)
-		);
-	$f->textarea(
-		-name=>"welcomeMessage",
-		-value=>$session{setting}{welcomeMessage},
-		-label=>WebGUI::International::get(869)
-		);
-        $f->textarea("recoverPasswordEmail",WebGUI::International::get(134),$session{setting}{recoverPasswordEmail});
         $f->textarea("mailFooter",WebGUI::International::get(824),$session{setting}{mailFooter});
         $f->yesNo("alertOnNewUser",WebGUI::International::get(534),$session{setting}{alertOnNewUser});
         $f->group("onNewUserAlertGroup",WebGUI::International::get(535),[$session{setting}{onNewUserAlertGroup}]);