diff --git a/doc/contributions.txt b/doc/contributions.txt
index ff982ec61a366a331fb1b632c26063df2e9c1497..7a662ef8fa3f1d546799007fd799cbdd32722122 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -155,6 +155,8 @@ Angus Boyd
 	VWR-592
 Ann Congrejo
 	CT-193
+Ansariel Hiller
+	STORM-1101
 Ardy Lay
 	VWR-19499
 	VWR-24917
@@ -417,6 +419,7 @@ Jonathan Yap
 	STORM-1020
 	STORM-1064
 	STORM-960
+	STORM-1101
 	STORM-1108
 	STORM-1094
 	STORM-1077
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 4bc8a7ec5412a70ea0dc9b3f61a72e4b0dc433bc..ca908ef8222df6587c8cec7d38ff68ff638e9ee6 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -720,6 +720,8 @@ bool idle_startup()
 
 		timeout_count = 0;
 
+		initialize_edit_menu();
+
 		if (show_connect_box)
 		{
 			// Load all the name information out of the login view
@@ -736,8 +738,6 @@ bool idle_startup()
 			// Make sure the process dialog doesn't hide things
 			gViewerWindow->setShowProgress(FALSE);
 
-			initialize_edit_menu();
-
 			// Show the login dialog
 			login_show();
 			// connect dialog is already shown, so fill in the names