diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 03236244a..cd6e3f461 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14587,9 +14587,9 @@ This should be as low as possible, but too low may break functionality</string>
     <key>ShowChatHistory</key>
     <map>
       <key>Comment</key>
-      <string/>
+      <string>Open local chat window on login</string>
       <key>Persist</key>
-      <integer>0</integer>
+      <integer>1</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
@@ -14598,9 +14598,9 @@ This should be as low as possible, but too low may break functionality</string>
     <key>ShowCommunicate</key>
     <map>
       <key>Comment</key>
-      <string/>
+      <string>Open communicate window on login</string>
       <key>Persist</key>
-      <integer>0</integer>
+      <integer>1</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
@@ -14609,9 +14609,9 @@ This should be as low as possible, but too low may break functionality</string>
     <key>ShowContacts</key>
     <map>
       <key>Comment</key>
-      <string/>
+      <string>Open contacts window on login</string>
       <key>Persist</key>
-      <integer>0</integer>
+      <integer>1</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
diff --git a/indra/newview/llfloaterchatterbox.cpp b/indra/newview/llfloaterchatterbox.cpp
index ce047c2cb..2e3598d23 100644
--- a/indra/newview/llfloaterchatterbox.cpp
+++ b/indra/newview/llfloaterchatterbox.cpp
@@ -118,7 +118,6 @@ LLFloaterChatterBox::LLFloaterChatterBox(const LLSD& seed) :
 	{
 		LLUICtrlFactory::getInstance()->buildFloater(this, "floater_chatterbox_wolf.xml", NULL, FALSE);
 	}
-	if (gSavedSettings.getBOOL("ShowCommunicate")) open();
 	
 	if (gSavedSettings.getBOOL("ContactsTornOff"))
 	{
@@ -149,6 +148,7 @@ LLFloaterChatterBox::LLFloaterChatterBox(const LLSD& seed) :
 	{
 		addFloater(floater_chat, FALSE);
 	}
+	if (gSavedSettings.getBOOL("ShowCommunicate")) open(); // After all floaters have been added, so we may not be hidden anyhow.
 	gSavedSettings.getControl("ShowLocalChatFloaterBar")->getSignal()->connect(boost::bind(handleLocalChatBar, floater_chat, _2));
 	mTabContainer->lockTabs();
 }
@@ -236,7 +236,7 @@ void LLFloaterChatterBox::onOpen()
 void LLFloaterChatterBox::onClose(bool app_quitting)
 {
 	setVisible(FALSE);
-	gSavedSettings.setBOOL("ShowCommunicate", FALSE);
+	if (!app_quitting) gSavedSettings.setBOOL("ShowCommunicate", false);
 }
 
 void LLFloaterChatterBox::setMinimized(BOOL minimized)