diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 3f4647b2eb..914de68d82 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -491,7 +491,8 @@
            icon="move_lock"
            label_ref="Command_Move_Lock_Label"
            tooltip_ref="Command_Move_Lock_Tooltip"
-           execute_function="Self.togglePhantom"
-           is_running_function="Self.getPhantom"
+           execute_function="Self.ToggleMoveLock"
+           is_running_function="Self.GetMoveLock"
+           is_enabled_function="Self.EnableMoveLock"
            />
 </commands>
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index a758f933cc..37f35b63a7 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -4117,8 +4117,8 @@ class FSSelfCheckForceSit : public view_listener_t
 	}
 };
 
-// Phantom mode -KC
-class FSSelfTogglePhantom : public view_listener_t
+// Phantom mode -KC & <FS:CR>
+class FSSelfToggleMoveLock : public view_listener_t
     {
         bool handleEvent(const LLSD& userdata)
         {
@@ -4138,7 +4138,7 @@ class FSSelfTogglePhantom : public view_listener_t
     };
 
 
-class FSSelfCheckPhantom : public view_listener_t
+class FSSelfCheckMoveLock : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
@@ -4157,6 +4157,17 @@ class FSSelfCheckPhantom : public view_listener_t
 	}
 };
 
+bool enable_move_lock()
+{
+#ifdef OPENSIM
+	// Phantom mode always works on opensim, at least right now.
+	if (LLGridManager::getInstance()->isInOpenSim())
+		return true;
+#endif // OPENSIM
+	return (gSavedSettings.getBOOL("UseLSLBridge") && FSLSLBridge::instance().isBridgeValid());
+}
+// </FS:CR>
+
 // [SJ - Adding IgnorePrejump in Menu ]
 class FSSelfToggleIgnorePreJump : public view_listener_t
     {
@@ -10424,8 +10435,9 @@ void initialize_menus()
 	view_listener_t::addMenu(new FSSelfForceSit(), "Self.ForceSit"); //KC
 	enable.add("Self.EnableForceSit", boost::bind(&enable_forcesit_self)); //KC
 	view_listener_t::addMenu(new FSSelfCheckForceSit(), "Self.getForceSit"); //KC
-	view_listener_t::addMenu(new FSSelfTogglePhantom(), "Self.togglePhantom"); //KC
-	view_listener_t::addMenu(new FSSelfCheckPhantom(), "Self.getPhantom"); //KC
+	view_listener_t::addMenu(new FSSelfToggleMoveLock(), "Self.ToggleMoveLock"); //KC
+	view_listener_t::addMenu(new FSSelfCheckMoveLock(), "Self.GetMoveLock"); //KC
+	enable.add("Self.EnableMoveLock", boost::bind(&enable_move_lock));	// <FS:CR>
 	view_listener_t::addMenu(new FSSelfToggleIgnorePreJump(), "Self.toggleIgnorePreJump"); //SJ
 	view_listener_t::addMenu(new FSSelfCheckIgnorePreJump(), "Self.getIgnorePreJump"); //SJ
 	view_listener_t::addMenu(new LLSelfRemoveAllAttachments(), "Self.RemoveAllAttachments");
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
index f3ec40b24d..5d2b609276 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
@@ -27,7 +27,6 @@
 		<slider name="progressive_draw_distance_interval" tool_tip="Intervall in Sekunden zwischen den jeweiligen Erhöhungen der Draw Distance."/>
 		<check_box name="UseLSLBridge" label="LSL-Client-Brücke aktivieren" tool_tip="Erlaub dem Viewer die Nutzung eines geskripteten Objektes (Brücke), um weitergehende Funktionen anzubieten."/>
 		<check_box name="UseLSLFlightAssist" label="Flug-Assistent der Brücke aktivieren" tool_tip="Aktiviert ein Skript, dass Fliegen und Schweben in größeren Höhen ermöglicht."/>
-		<check_box name="UseMoveLock" label="Movelock-Funktion der Brücke aktivieren und Avatar an Position halten"/>
 	</panel>
 
 
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 298dda223d..8ed2b10c50 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -178,9 +178,11 @@
              shortcut="control|alt|P"
 			 name="Move Lock">
                 <menu_item_check.on_check
-                   function="Self.getPhantom" />
+                   function="Self.GetMoveLock" />
                 <menu_item_check.on_click
-                   function="Self.togglePhantom" />
+                   function="Self.ToggleMoveLock" />
+                <menu_item_check.on_enable
+                   function="Self.EnableMoveLock" />
 			</menu_item_check>
 			<menu_item_check
 			 label="Quickjump"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
index a3a56d8061..225fca4676 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
@@ -238,17 +238,6 @@
          label="Enable Bridge Flight Assist"
          width="270"
          tool_tip="Enables the script that assists flying and hovering at extended altitudes"/>
-        <check_box
-         top_pad="5"
-         control_name="UseMoveLock"
-         enabled_control="UseLSLBridge"
-         follows="left|top"
-         height="16"
-         initial_value="false"
-         name="UseMoveLock"
-         label="Enable movelock in Bridge and lock yourself in place"
-         left="15"
-         width="270"/>
 
     </panel>
 
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
index 4e25612d2b..777128fb47 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_firestorm.xml
@@ -22,7 +22,6 @@
         <check_box label="Oddzielne frazy wyszukiwania dla każdej z zakładek Szafy" name="FSSplitInventorySearchOverTabs" tool_tip="Gdy włączysz tą opcję, to będzie możliwe wprowadzanie oddzielnych fraz wyszukiwania dla każdej z zakładek Szafy." />
         <check_box name="UseLSLBridge" label="Włącz Most w LScript Language" tool_tip="Pozwala Firestormowi na używanie oskryptowanego dodatku (Mostu), aby rozszerzyć znacznie swoje możliwości" />
         <check_box name="UseLSLFlightAssist" label="Włącz pomocnika lotu w Moście" tool_tip="Włącza skrypt pomagający latać i zawisać na większych wysokościach" />
-        <check_box name="UseMoveLock" label="Włącz blokadę pozycji w Moście i unieruchom się w miejscu" />
         <check_box label="Stopniowe powiększanie pola widzenia" name="FSRenderFarClipStepping" tool_tip="Jeśli włączysz tą opcję, to Firestorm będzie stopniowo zwiększać pole widzenia po teleportacji." />
         <slider name="progressive_draw_distance_interval" tool_tip="Odstęp w sekundach pomiędzy każdym kolejnym powiększeniem pola widzenia." />
     </panel>