diff --git a/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt b/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt
index 2128335b15..2d464d41b0 100644
--- a/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt
+++ b/indra/newview/fs_resources/EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt
@@ -1,4 +1,4 @@
-//http bridge script v.2.5
+//http bridge script v.2.6
 //Firestorm
 //Tozh Taurog, Arrehn Oberlander, Tonya Souther
 
@@ -19,7 +19,7 @@
     integer UNKNOWN_VIEWER = 1;
     integer META_CONTROL = 1024;      // Control value to do nothing; for no-script sims
     string  bridgeAuth = "BRIDGEKEY"; // Filled in dynamically
-    string  bridgeVersion = "2.5";    // This should match fslslbridge.cpp
+    string  bridgeVersion = "2.6";    // This should match fslslbridge.cpp
     string  bridgeURL;
     string  latestURL;
     integer debug = FALSE;
@@ -687,9 +687,12 @@ default
     }
 
     on_rez(integer i)
-    // We don't want to be rezzed without being attached. Insure we don't create litter.
     {
+        // We don't want to be rezzed without being attached. Insure we don't create litter.
         llSetPrimitiveParams([PRIM_TEMP_ON_REZ, TRUE]);
+        // Force Movelock variable to false here and allow attach() to decide via initBridge(), if we're on Firestorm and login relock can be turned off if needed.
+        // on_rez() will be triggered prior to attach() when attaching from inventory or during login, but not prior to state_entry().
+        useMoveLock = FALSE;
     }
 
     attach(key k)
diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp
index c282f16df5..c2de179b70 100644
--- a/indra/newview/fslslbridge.cpp
+++ b/indra/newview/fslslbridge.cpp
@@ -64,10 +64,10 @@
 #define FS_BRIDGE_FOLDER "#LSL Bridge"
 #define FS_BRIDGE_CONTAINER_FOLDER "Landscaping"
 #define FS_BRIDGE_MAJOR_VERSION 2
-#define FS_BRIDGE_MINOR_VERSION 5
+#define FS_BRIDGE_MINOR_VERSION 6
 #define FS_MAX_MINOR_VERSION 99
 
-//current script version is 2.5
+//current script version is 2.6
 const std::string UPLOAD_SCRIPT_CURRENT = "EBEDD1D2-A320-43f5-88CF-DD47BBCA5DFB.lsltxt";
 
 //
@@ -230,6 +230,14 @@ bool FSLSLBridge::lslToViewer(std::string message, LLUUID fromID, LLUUID ownerID
 			updateBoolSettingValue("UseMoveLock");
 			updateBoolSettingValue("FSPublishRadarTag");
 			mIsFirstCallDone = true;
+
+			// <FS:PP> Inform user, if movelock was enabled at login
+			if (gSavedSettings.getBOOL("UseMoveLock"))
+			{
+				reportToNearbyChat(LLTrans::getString("MovelockEnabled"));
+			}
+			// </FS:PP>
+
 		}
 		// <FS:PP> FIRE-11924: Refresh movelock position after region change (crossing/teleporting), if lock was enabled
 		// Not called right after logging in, and only if movelock was enabled during transition