diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp
index 0c5714d952..d810d365bc 100644
--- a/indra/llui/llconsole.cpp
+++ b/indra/llui/llconsole.cpp
@@ -159,8 +159,8 @@ void LLConsole::draw()
     // <FS>
     //static const F32 padding_horizontal = 10;
     //static const F32 padding_vertical = 3;
-    static const F32 padding_horizontal = 15;
-    static const F32 padding_vertical = 8;
+    constexpr F32 padding_horizontal = 15;
+    constexpr F32 padding_vertical = 8;
     // </FS>
     LLGLSUIDefault gls_ui;
 
@@ -177,7 +177,7 @@ void LLConsole::draw()
 
     // <FS:minerjr> [FIRE-35039] Add flag to show/hide the on-screen console   
     // Get the Show On-screen Console flag from the Comm menu
-    static LLCachedControl<bool> showOnscreenConsole(*LLUI::getInstance()->mSettingGroups["config"], "FSShowOnscreenConsole");    
+    static LLUICachedControl<bool> showOnscreenConsole("FSShowOnscreenConsole");
     // If the Show On-screen Console flag is disabled and the current console is the global console
     // (Not a debug console), then don't try to draw
     if (!showOnscreenConsole && this == gConsole)
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 651dfffed4..d4c9abae92 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -5142,6 +5142,13 @@ class FSSelfCheckMoveLock : public view_listener_t
         if (LLGridManager::getInstance()->isInSecondLife())
         {
             new_value = gSavedPerAccountSettings.getBOOL("UseMoveLock");
+            // <FS:Chanayane> prevents having Move Lock activated but disabled when for some reason the LSL Bridge is not worn or not ready
+            if (new_value && !enable_bridge_function())
+            {
+                gSavedPerAccountSettings.setBOOL("UseMoveLock", false);
+                new_value = false;
+            }
+            // </FS:Chanayane>
         }
 #ifdef OPENSIM
         else