diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 6d873d0be..517bfb424 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -459,7 +459,7 @@ void LLPanelLogin::mungePassword(const std::string& password)
 		}
 		else
 		{
-			LLMD5 pass((unsigned char *)utf8str_truncate(password, 16).c_str());
+			LLMD5 pass((unsigned char *)utf8str_truncate(password, gHippoGridManager->getCurrentGrid()->isOpenSimulator() ? 24 : 16).c_str());
 			char munged_password[MD5HEX_STR_SIZE];
 			pass.hex_digest(munged_password);
 			mMungedPassword = munged_password;
diff --git a/indra/newview/skins/default/xui/en-us/panel_login.xml b/indra/newview/skins/default/xui/en-us/panel_login.xml
index d1c875ad1..9a490a516 100644
--- a/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -35,7 +35,7 @@
       </text>
       <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20"
            follows="left|bottom" font="SansSerifSmall" handle_edit_keys_directly="true"
-           height="20" left="4" max_length="16" mouse_opaque="true"
+           height="20" left="4" max_length="24" mouse_opaque="true"
            name="password_edit" select_all_on_focus_received="true" width="115" />
     </layout_panel>
     <layout_panel name="grids_panel" left="0" user_resize="false" auto_resize="false" width="143" min_width="0" visibility_control="ForceShowGrid">