diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a32d8c453c..c4c7e96909 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -25015,6 +25015,19 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>FSNoVersionPopup</key>
+    <map>
+      <key>Comment</key>
+      <string>Disables version popup on the Firestorm Login page</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+      <key>HideFromEditor</key>
+      <integer>1</integer>
+    </map>
     <key>FSllOwnerSayToScriptDebugWindowRouting</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/fspanellogin.cpp b/indra/newview/fspanellogin.cpp
index 1c6d7ddf98..595b47dc47 100644
--- a/indra/newview/fspanellogin.cpp
+++ b/indra/newview/fspanellogin.cpp
@@ -923,6 +923,12 @@ void FSPanelLogin::loadLoginPage()
     // login page (web) content version
     params["login_content_version"] = gSavedSettings.getString("LoginContentVersion");
 
+    // No version popup
+    if (gSavedSettings.getBOOL("FSNoVersionPopup"))
+    {
+        params["noversionpopup"] = "true";
+    }
+
     // Make an LLURI with this augmented info
     std::string url = login_page.scheme().empty()? login_page.authority() : login_page.scheme() + "://" + login_page.authority();
     LLURI login_uri(LLURI::buildHTTP(url,