diff --git a/indra/newview/llfloaterforgetuser.cpp b/indra/newview/llfloaterforgetuser.cpp
index 5659cb2f793fb780cdb0290dc3a3c6676b302585..55e25ace9a0206fd3d009ace6ab760aef02e6491 100644
--- a/indra/newview/llfloaterforgetuser.cpp
+++ b/indra/newview/llfloaterforgetuser.cpp
@@ -99,7 +99,9 @@ BOOL LLFloaterForgetUser::postBuild()
     }
 
     bool enable_button = scroll_list->getFirstSelectedIndex() != -1;
-    getChild<LLView>("delete_data")->setEnabled(enable_button);
+    LLCheckBoxCtrl *chk_box = getChild<LLCheckBoxCtrl>("delete_data");
+    chk_box->setEnabled(enable_button);
+    chk_box->set(FALSE);
     LLButton *button = getChild<LLButton>("forget");
     button->setEnabled(enable_button);
     button->setCommitCallback(boost::bind(&LLFloaterForgetUser::onForgetClicked, this));
diff --git a/indra/newview/skins/default/xui/en/floater_forget_user.xml b/indra/newview/skins/default/xui/en/floater_forget_user.xml
index 0673901a967f63de91ff6a592640b9cfbaa158ae..86228d49ee5433162f7430b016e107fd9d56e5a5 100644
--- a/indra/newview/skins/default/xui/en/floater_forget_user.xml
+++ b/indra/newview/skins/default/xui/en/floater_forget_user.xml
@@ -35,6 +35,5 @@
      name="delete_data"
      top_pad="5"
      width="260"
-     initial_value="1"
      tool_tip="Deletes local files: chat history, last session screenshot, browser cookies, teleport history, toolbar settings, e t c"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 873f03aae953bd50fad749c028e0e055697a17cb..766406e1d8f74bb0baa5b2e0a70b1d34bff76b20 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -137,7 +137,7 @@
     label="Remember me"
     check_button.bottom="3"
     name="remember_name"
-    tool_tip="Already recorded user can be forgotten from preferences."
+    tool_tip="Already remembered user can be forgotten from Me &gt; Preferences &gt; Advanced &gt; Remembered Usernames."
     width="145" />
   <check_box
     control_name="RememberPassword"