diff --git a/Program.cs b/Program.cs
index a87d4ba..12e963d 100644
--- a/Program.cs
+++ b/Program.cs
@@ -46,9 +46,6 @@ namespace MeshCentralRouter
                 }
             }
 
-            LockToHostname = "central.mesh.meshcentral.com";
-            LockToServerId = "D99362D5ED8BAEA8BF9E743B34B242256370C460FD66CB62373C6CFCB204D6D707403E396CF0EF6DC2B3A42F735135FD";
-
             Uri authLoginUrl = null;
 
             // Setup settings & visual style
@@ -65,6 +62,14 @@ namespace MeshCentralRouter
                 if (arg.Length > 3 && string.Compare(arg.Substring(0, 3), "-l:", true) == 0) {
                     try { System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(arg.Substring(3)); } catch (ArgumentException) { }
                 }
+                if ((arg.Length == 5) && (string.Compare(arg.Substring(0, 5), "-info", true) == 0))
+                {
+                    string dialogText = string.Format(Properties.Resources.Version, System.Reflection.Assembly.GetExecutingAssembly().ImageRuntimeVersion);
+                    if (LockToHostname != null) { dialogText += "\r\n" + string.Format(Properties.Resources.LockedToHost, LockToHostname); }
+                    if (LockToServerId != null) { dialogText += "\r\n" + string.Format(Properties.Resources.LockedToServerId, LockToServerId); }
+                    MessageBox.Show(dialogText, Properties.Resources.MeshCentralRouter);
+                    return;
+                }
                 if (arg.Length > 11 && arg.Substring(0, 11).ToLower() == "mcrouter://") { authLoginUrl = new Uri(arg); }
             }
 
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 7f3d1ab..6fa5bdd 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -998,6 +998,15 @@ namespace MeshCentralRouter.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Version {0}.
+        /// </summary>
+        internal static string Version {
+            get {
+                return ResourceManager.GetString("Version", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Very slow.
         /// </summary>
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 2563f04..5b2a285 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -466,4 +466,7 @@
   <data name="SignedExecutableServerLockError" xml:space="preserve">
     <value>This executable is locked to only connect to {0}.</value>
   </data>
+  <data name="Version" xml:space="preserve">
+    <value>Version {0}</value>
+  </data>
 </root>
\ No newline at end of file