diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 564cd38..4ee173d 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -610,6 +610,15 @@ namespace MeshCentralRouter.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Message Sent.
+        /// </summary>
+        internal static string MessageSent {
+            get {
+                return ResourceManager.GetString("MessageSent", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to MQTT.
         /// </summary>
@@ -845,6 +854,15 @@ namespace MeshCentralRouter.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Send token to registered messaging application?.
+        /// </summary>
+        internal static string SendTokenMSG {
+            get {
+                return ResourceManager.GetString("SendTokenMSG", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Send token to registered phone number?.
         /// </summary>
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 356d614..6a98f0c 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -472,4 +472,10 @@
   <data name="None" xml:space="preserve">
     <value>None</value>
   </data>
+  <data name="MessageSent" xml:space="preserve">
+    <value>Message Sent</value>
+  </data>
+  <data name="SendTokenMSG" xml:space="preserve">
+    <value>Send token to registered messaging application?</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/MainForm.Designer.cs b/src/MainForm.Designer.cs
index 5fa8008..0897163 100644
--- a/src/MainForm.Designer.cs
+++ b/src/MainForm.Designer.cs
@@ -52,6 +52,7 @@
             this.pictureBox2 = new System.Windows.Forms.PictureBox();
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.msgTokenButton = new System.Windows.Forms.Button();
             this.tokenRememberCheckBox = new System.Windows.Forms.CheckBox();
             this.emailTokenButton = new System.Windows.Forms.Button();
             this.smsTokenButton = new System.Windows.Forms.Button();
@@ -331,6 +332,7 @@
             // 
             // panel2
             // 
+            this.panel2.Controls.Add(this.msgTokenButton);
             this.panel2.Controls.Add(this.tokenRememberCheckBox);
             this.panel2.Controls.Add(this.emailTokenButton);
             this.panel2.Controls.Add(this.smsTokenButton);
@@ -345,6 +347,13 @@
             resources.ApplyResources(this.panel2, "panel2");
             this.panel2.Name = "panel2";
             // 
+            // msgTokenButton
+            // 
+            resources.ApplyResources(this.msgTokenButton, "msgTokenButton");
+            this.msgTokenButton.Name = "msgTokenButton";
+            this.msgTokenButton.UseVisualStyleBackColor = true;
+            this.msgTokenButton.Click += new System.EventHandler(this.msgTokenButton_Click);
+            // 
             // tokenRememberCheckBox
             // 
             resources.ApplyResources(this.tokenRememberCheckBox, "tokenRememberCheckBox");
@@ -1149,6 +1158,7 @@
         private System.Windows.Forms.Button connectionSettings;
         private System.Windows.Forms.ToolStripMenuItem customAppsToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem customAppsToolStripMenuItem1;
+        private System.Windows.Forms.Button msgTokenButton;
     }
 }
 
diff --git a/src/MainForm.cs b/src/MainForm.cs
index 2a97c72..6bf6978 100644
--- a/src/MainForm.cs
+++ b/src/MainForm.cs
@@ -51,6 +51,7 @@ namespace MeshCentralRouter
         public bool forceExit = false;
         public bool sendEmailToken = false;
         public bool sendSMSToken = false;
+        public bool sendMsgToken = false;
         public bool allowUpdates = Settings.GetRegValue("CheckForUpdates", true);
         public bool collapseDeviceGroup = Settings.GetRegValue("CollapseDeviceGroups", true);
         public Uri authLoginUrl = null;
@@ -990,10 +991,12 @@ namespace MeshCentralRouter
                 if (meshcentral.disconnectMsg == "tokenrequired")
                 {
                     emailTokenButton.Visible = (meshcentral.disconnectEmail2FA == true) && (meshcentral.disconnectEmail2FASent == false);
-                    tokenEmailSentLabel.Visible = (meshcentral.disconnectEmail2FASent == true) || (meshcentral.disconnectSms2FASent == true);
+                    tokenEmailSentLabel.Visible = (meshcentral.disconnectEmail2FASent == true) || (meshcentral.disconnectSms2FASent == true) || (meshcentral.disconnectMsg2FASent == true);
                     smsTokenButton.Visible = ((meshcentral.disconnectSms2FA == true) && (meshcentral.disconnectSms2FASent == false));
+                    msgTokenButton.Visible = ((meshcentral.disconnectMsg2FA == true) && (meshcentral.disconnectMsg2FASent == false));
                     if (meshcentral.disconnectEmail2FASent) { tokenEmailSentLabel.Text = Translate.T(Properties.Resources.EmailSent); }
                     if (meshcentral.disconnectSms2FASent) { tokenEmailSentLabel.Text = Translate.T(Properties.Resources.SmsSent); }
+                    if (meshcentral.disconnectMsg2FASent) { tokenEmailSentLabel.Text = Translate.T(Properties.Resources.MessageSent); }
                     if ((meshcentral.disconnectEmail2FA == true) && (meshcentral.disconnectEmail2FASent == false))
                     {
                         smsTokenButton.Left = emailTokenButton.Left + emailTokenButton.Width + 5;
@@ -1406,7 +1409,7 @@ namespace MeshCentralRouter
 
         private void nextButton2_Click(object sender, EventArgs e)
         {
-            if ((tokenTextBox.Text.Replace(" ", "") == "") && (sendEmailToken == false) && (sendSMSToken == false)) return;
+            if ((tokenTextBox.Text.Replace(" ", "") == "") && (sendEmailToken == false) && (sendSMSToken == false) && (sendMsgToken == false)) return;
 
             // Attempt to login with token
             addButton.Enabled = false;
@@ -1465,6 +1468,11 @@ namespace MeshCentralRouter
                 sendSMSToken = false;
                 meshcentral.connect(serverurl, userNameTextBox.Text, passwordTextBox.Text, "**sms**", getClientAuthCertificate());
             }
+            else if (sendMsgToken == true)
+            {
+                sendMsgToken = false;
+                meshcentral.connect(serverurl, userNameTextBox.Text, passwordTextBox.Text, "**msg**", getClientAuthCertificate());
+            }
             else
             {
                 meshcentral.connect(serverurl, userNameTextBox.Text, passwordTextBox.Text, tokenTextBox.Text.Replace(" ", ""), getClientAuthCertificate());
@@ -1779,6 +1787,7 @@ namespace MeshCentralRouter
             {
                 sendEmailToken = true;
                 sendSMSToken = false;
+                sendMsgToken = false;
                 nextButton2_Click(this, null);
             }
         }
@@ -1789,6 +1798,18 @@ namespace MeshCentralRouter
             {
                 sendEmailToken = false;
                 sendSMSToken = true;
+                sendMsgToken = false;
+                nextButton2_Click(this, null);
+            }
+        }
+
+        private void msgTokenButton_Click(object sender, EventArgs e)
+        {
+            if (MessageBox.Show(this, Translate.T(Properties.Resources.SendTokenMSG), Translate.T(Properties.Resources.TwoFactorAuthentication), MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
+            {
+                sendEmailToken = false;
+                sendSMSToken = false;
+                sendMsgToken = true;
                 nextButton2_Click(this, null);
             }
         }
diff --git a/src/MainForm.resx b/src/MainForm.resx
index 658b436..69d8a4a 100644
--- a/src/MainForm.resx
+++ b/src/MainForm.resx
@@ -129,10 +129,13 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="connectionSettings.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 286</value>
+    <value>13, 355</value>
+  </data>
+  <data name="connectionSettings.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="connectionSettings.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 23</value>
+    <value>127, 28</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="connectionSettings.TabIndex" type="System.Int32, mscorlib">
@@ -163,10 +166,13 @@
     <value>NoControl</value>
   </data>
   <data name="installButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>111, 286</value>
+    <value>148, 355</value>
+  </data>
+  <data name="installButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="installButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 23</value>
+    <value>127, 28</value>
   </data>
   <data name="installButton.TabIndex" type="System.Int32, mscorlib">
     <value>104</value>
@@ -202,10 +208,13 @@
     <value>NoControl</value>
   </data>
   <data name="stateLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>241, 225</value>
+    <value>321, 277</value>
+  </data>
+  <data name="stateLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="stateLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>88, 13</value>
+    <value>114, 17</value>
   </data>
   <data name="stateLabel.TabIndex" type="System.Int32, mscorlib">
     <value>19</value>
@@ -235,10 +244,13 @@
     <value>NoControl</value>
   </data>
   <data name="label28.Location" type="System.Drawing.Point, System.Drawing">
-    <value>238, 176</value>
+    <value>317, 217</value>
+  </data>
+  <data name="label28.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="label28.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 13</value>
+    <value>69, 17</value>
   </data>
   <data name="label28.TabIndex" type="System.Int32, mscorlib">
     <value>18</value>
@@ -265,10 +277,13 @@
     <value>NoControl</value>
   </data>
   <data name="label27.Location" type="System.Drawing.Point, System.Drawing">
-    <value>238, 135</value>
+    <value>317, 166</value>
+  </data>
+  <data name="label27.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="label27.Size" type="System.Drawing.Size, System.Drawing">
-    <value>55, 13</value>
+    <value>73, 17</value>
   </data>
   <data name="label27.TabIndex" type="System.Int32, mscorlib">
     <value>17</value>
@@ -295,10 +310,13 @@
     <value>NoControl</value>
   </data>
   <data name="label26.Location" type="System.Drawing.Point, System.Drawing">
-    <value>238, 92</value>
+    <value>317, 113</value>
+  </data>
+  <data name="label26.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="label26.Size" type="System.Drawing.Size, System.Drawing">
-    <value>38, 13</value>
+    <value>50, 17</value>
   </data>
   <data name="label26.TabIndex" type="System.Int32, mscorlib">
     <value>16</value>
@@ -322,13 +340,16 @@
     <value>Top, Left, Right</value>
   </data>
   <data name="passwordTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>241, 192</value>
+    <value>321, 236</value>
+  </data>
+  <data name="passwordTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="passwordTextBox.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
     <value>●</value>
   </data>
   <data name="passwordTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>214, 20</value>
+    <value>287, 22</value>
   </data>
   <data name="passwordTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>102</value>
@@ -352,10 +373,13 @@
     <value>meshcentral.com</value>
   </data>
   <data name="serverNameComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>241, 110</value>
+    <value>321, 135</value>
+  </data>
+  <data name="serverNameComboBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="serverNameComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>214, 21</value>
+    <value>287, 24</value>
   </data>
   <data name="serverNameComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>100</value>
@@ -376,10 +400,13 @@
     <value>Top, Left, Right</value>
   </data>
   <data name="userNameTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>241, 151</value>
+    <value>321, 186</value>
+  </data>
+  <data name="userNameTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="userNameTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>214, 20</value>
+    <value>287, 22</value>
   </data>
   <data name="userNameTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>101</value>
@@ -403,10 +430,13 @@
     <value>NoControl</value>
   </data>
   <data name="licenseLinkLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>174, 260</value>
+    <value>235, 323</value>
+  </data>
+  <data name="licenseLinkLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="licenseLinkLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>303, 13</value>
+    <value>404, 16</value>
   </data>
   <data name="licenseLinkLabel.TabIndex" type="System.Int32, mscorlib">
     <value>103</value>
@@ -439,10 +469,13 @@
     <value>NoControl</value>
   </data>
   <data name="versionLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 260</value>
+    <value>4, 323</value>
+  </data>
+  <data name="versionLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="versionLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>37, 13</value>
+    <value>47, 17</value>
   </data>
   <data name="versionLabel.TabIndex" type="System.Int32, mscorlib">
     <value>11</value>
@@ -469,10 +502,13 @@
     <value>NoControl</value>
   </data>
   <data name="nextButton1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>372, 286</value>
+    <value>499, 355</value>
+  </data>
+  <data name="nextButton1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="nextButton1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 23</value>
+    <value>127, 28</value>
   </data>
   <data name="nextButton1.TabIndex" type="System.Int32, mscorlib">
     <value>105</value>
@@ -499,10 +535,13 @@
     <value>NoControl</value>
   </data>
   <data name="pictureBox3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 278</value>
+    <value>0, 345</value>
+  </data>
+  <data name="pictureBox3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="pictureBox3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>478, 40</value>
+    <value>640, 49</value>
   </data>
   <data name="pictureBox3.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -529,10 +568,13 @@
     <value>NoControl</value>
   </data>
   <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 9</value>
+    <value>16, 11</value>
+  </data>
+  <data name="label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>454, 56</value>
+    <value>608, 69</value>
   </data>
   <data name="label1.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -559,10 +601,13 @@
     <value>NoControl</value>
   </data>
   <data name="pictureBox2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 68</value>
+    <value>20, 84</value>
+  </data>
+  <data name="pictureBox2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="pictureBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>217, 170</value>
+    <value>292, 212</value>
   </data>
   <data name="pictureBox2.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>Zoom</value>
@@ -586,10 +631,13 @@
     <value>Fill</value>
   </data>
   <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
+    <value>4, 4</value>
+  </data>
+  <data name="panel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>478, 316</value>
+    <value>640, 392</value>
   </data>
   <data name="panel1.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -607,13 +655,16 @@
     <value>0</value>
   </data>
   <data name="tabPage1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 25</value>
+    <value>4, 28</value>
+  </data>
+  <data name="tabPage1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="tabPage1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 3, 3, 3</value>
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>484, 322</value>
+    <value>648, 400</value>
   </data>
   <data name="tabPage1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -633,6 +684,39 @@
   <data name="&gt;&gt;tabPage1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="msgTokenButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="msgTokenButton.Location" type="System.Drawing.Point, System.Drawing">
+    <value>320, 216</value>
+  </data>
+  <data name="msgTokenButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
+  <data name="msgTokenButton.Size" type="System.Drawing.Size, System.Drawing">
+    <value>127, 28</value>
+  </data>
+  <data name="msgTokenButton.TabIndex" type="System.Int32, mscorlib">
+    <value>207</value>
+  </data>
+  <data name="msgTokenButton.Text" xml:space="preserve">
+    <value>Messaging</value>
+  </data>
+  <data name="msgTokenButton.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;msgTokenButton.Name" xml:space="preserve">
+    <value>msgTokenButton</value>
+  </data>
+  <data name="&gt;&gt;msgTokenButton.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;msgTokenButton.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;msgTokenButton.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="tokenRememberCheckBox.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -640,10 +724,13 @@
     <value>NoControl</value>
   </data>
   <data name="tokenRememberCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>241, 221</value>
+    <value>321, 272</value>
+  </data>
+  <data name="tokenRememberCheckBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="tokenRememberCheckBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>131, 17</value>
+    <value>170, 21</value>
   </data>
   <data name="tokenRememberCheckBox.TabIndex" type="System.Int32, mscorlib">
     <value>204</value>
@@ -664,16 +751,19 @@
     <value>panel2</value>
   </data>
   <data name="&gt;&gt;tokenRememberCheckBox.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="emailTokenButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="emailTokenButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>241, 177</value>
+    <value>321, 180</value>
+  </data>
+  <data name="emailTokenButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="emailTokenButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 23</value>
+    <value>127, 28</value>
   </data>
   <data name="emailTokenButton.TabIndex" type="System.Int32, mscorlib">
     <value>202</value>
@@ -694,16 +784,19 @@
     <value>panel2</value>
   </data>
   <data name="&gt;&gt;emailTokenButton.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="smsTokenButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="smsTokenButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>342, 177</value>
+    <value>456, 180</value>
+  </data>
+  <data name="smsTokenButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="smsTokenButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 23</value>
+    <value>127, 28</value>
   </data>
   <data name="smsTokenButton.TabIndex" type="System.Int32, mscorlib">
     <value>203</value>
@@ -724,7 +817,7 @@
     <value>panel2</value>
   </data>
   <data name="&gt;&gt;smsTokenButton.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="tokenEmailSentLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -733,10 +826,13 @@
     <value>NoControl</value>
   </data>
   <data name="tokenEmailSentLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>238, 182</value>
+    <value>317, 186</value>
+  </data>
+  <data name="tokenEmailSentLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="tokenEmailSentLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>55, 13</value>
+    <value>73, 17</value>
   </data>
   <data name="tokenEmailSentLabel.TabIndex" type="System.Int32, mscorlib">
     <value>21</value>
@@ -757,7 +853,7 @@
     <value>panel2</value>
   </data>
   <data name="&gt;&gt;tokenEmailSentLabel.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="label3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -766,10 +862,13 @@
     <value>NoControl</value>
   </data>
   <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>238, 135</value>
+    <value>317, 128</value>
+  </data>
+  <data name="label3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>38, 13</value>
+    <value>48, 17</value>
   </data>
   <data name="label3.TabIndex" type="System.Int32, mscorlib">
     <value>19</value>
@@ -787,16 +886,19 @@
     <value>panel2</value>
   </data>
   <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="tokenTextBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
   <data name="tokenTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>241, 151</value>
+    <value>321, 148</value>
+  </data>
+  <data name="tokenTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="tokenTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>214, 20</value>
+    <value>287, 22</value>
   </data>
   <data name="tokenTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>201</value>
@@ -811,7 +913,7 @@
     <value>panel2</value>
   </data>
   <data name="&gt;&gt;tokenTextBox.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="pictureBox6.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left, Right</value>
@@ -820,10 +922,13 @@
     <value>NoControl</value>
   </data>
   <data name="pictureBox6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 68</value>
+    <value>20, 84</value>
+  </data>
+  <data name="pictureBox6.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="pictureBox6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>217, 170</value>
+    <value>292, 212</value>
   </data>
   <data name="pictureBox6.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>Zoom</value>
@@ -841,7 +946,7 @@
     <value>panel2</value>
   </data>
   <data name="&gt;&gt;pictureBox6.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="backButton2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Right</value>
@@ -850,10 +955,13 @@
     <value>NoControl</value>
   </data>
   <data name="backButton2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>270, 286</value>
+    <value>363, 355</value>
+  </data>
+  <data name="backButton2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="backButton2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 23</value>
+    <value>127, 28</value>
   </data>
   <data name="backButton2.TabIndex" type="System.Int32, mscorlib">
     <value>205</value>
@@ -871,7 +979,7 @@
     <value>panel2</value>
   </data>
   <data name="&gt;&gt;backButton2.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <data name="nextButton2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Right</value>
@@ -880,10 +988,13 @@
     <value>NoControl</value>
   </data>
   <data name="nextButton2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>372, 286</value>
+    <value>499, 355</value>
+  </data>
+  <data name="nextButton2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="nextButton2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 23</value>
+    <value>127, 28</value>
   </data>
   <data name="nextButton2.TabIndex" type="System.Int32, mscorlib">
     <value>206</value>
@@ -901,7 +1012,7 @@
     <value>panel2</value>
   </data>
   <data name="&gt;&gt;nextButton2.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
   </data>
   <data name="pictureBox4.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left, Right</value>
@@ -910,10 +1021,13 @@
     <value>NoControl</value>
   </data>
   <data name="pictureBox4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 278</value>
+    <value>0, 345</value>
+  </data>
+  <data name="pictureBox4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="pictureBox4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>478, 40</value>
+    <value>640, 49</value>
   </data>
   <data name="pictureBox4.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -931,7 +1045,7 @@
     <value>panel2</value>
   </data>
   <data name="&gt;&gt;pictureBox4.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <data name="label2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
@@ -940,10 +1054,13 @@
     <value>NoControl</value>
   </data>
   <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 9</value>
+    <value>16, 11</value>
+  </data>
+  <data name="label2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>454, 56</value>
+    <value>608, 69</value>
   </data>
   <data name="label2.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -961,16 +1078,19 @@
     <value>panel2</value>
   </data>
   <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>11</value>
   </data>
   <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
   <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
+    <value>4, 4</value>
+  </data>
+  <data name="panel2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>478, 316</value>
+    <value>640, 392</value>
   </data>
   <data name="panel2.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -988,13 +1108,16 @@
     <value>0</value>
   </data>
   <data name="tabPage2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 25</value>
+    <value>4, 28</value>
+  </data>
+  <data name="tabPage2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="tabPage2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 3, 3, 3</value>
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>484, 322</value>
+    <value>648, 400</value>
   </data>
   <data name="tabPage2.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -1024,10 +1147,13 @@
     <value>NoControl</value>
   </data>
   <data name="rememberCertCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>208, 256</value>
+    <value>277, 319</value>
+  </data>
+  <data name="rememberCertCheckBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="rememberCertCheckBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>145, 17</value>
+    <value>190, 21</value>
   </data>
   <data name="rememberCertCheckBox.TabIndex" type="System.Int32, mscorlib">
     <value>302</value>
@@ -1051,7 +1177,10 @@
     <value>Top, Bottom, Left, Right</value>
   </data>
   <data name="certDetailsTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 82</value>
+    <value>20, 101</value>
+  </data>
+  <data name="certDetailsTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="certDetailsTextBox.Multiline" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1060,7 +1189,7 @@
     <value>Vertical</value>
   </data>
   <data name="certDetailsTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>450, 162</value>
+    <value>602, 202</value>
   </data>
   <data name="certDetailsTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>25</value>
@@ -1084,10 +1213,13 @@
     <value>NoControl</value>
   </data>
   <data name="certDetailsButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 251</value>
+    <value>19, 313</value>
+  </data>
+  <data name="certDetailsButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="certDetailsButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>188, 23</value>
+    <value>251, 28</value>
   </data>
   <data name="certDetailsButton.TabIndex" type="System.Int32, mscorlib">
     <value>301</value>
@@ -1117,10 +1249,13 @@
     <value>NoControl</value>
   </data>
   <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 6</value>
+    <value>11, 7</value>
+  </data>
+  <data name="label4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>468, 22</value>
+    <value>627, 27</value>
   </data>
   <data name="label4.TabIndex" type="System.Int32, mscorlib">
     <value>23</value>
@@ -1150,10 +1285,13 @@
     <value>NoControl</value>
   </data>
   <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 34</value>
+    <value>16, 42</value>
+  </data>
+  <data name="label5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>454, 45</value>
+    <value>608, 55</value>
   </data>
   <data name="label5.TabIndex" type="System.Int32, mscorlib">
     <value>22</value>
@@ -1180,10 +1318,13 @@
     <value>NoControl</value>
   </data>
   <data name="backButton3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>276, 291</value>
+    <value>371, 362</value>
+  </data>
+  <data name="backButton3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="backButton3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 23</value>
+    <value>127, 28</value>
   </data>
   <data name="backButton3.TabIndex" type="System.Int32, mscorlib">
     <value>303</value>
@@ -1210,10 +1351,13 @@
     <value>NoControl</value>
   </data>
   <data name="nextButton3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>378, 291</value>
+    <value>507, 362</value>
+  </data>
+  <data name="nextButton3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="nextButton3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 23</value>
+    <value>127, 28</value>
   </data>
   <data name="nextButton3.TabIndex" type="System.Int32, mscorlib">
     <value>304</value>
@@ -1240,10 +1384,13 @@
     <value>NoControl</value>
   </data>
   <data name="pictureBox5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 282</value>
+    <value>0, 351</value>
+  </data>
+  <data name="pictureBox5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="pictureBox5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>484, 40</value>
+    <value>648, 49</value>
   </data>
   <data name="pictureBox5.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -1269,8 +1416,11 @@
   <data name="panel3.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="panel3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>484, 322</value>
+    <value>648, 400</value>
   </data>
   <data name="panel3.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -1288,10 +1438,13 @@
     <value>0</value>
   </data>
   <data name="tabPage3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 25</value>
+    <value>4, 28</value>
+  </data>
+  <data name="tabPage3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>484, 322</value>
+    <value>648, 400</value>
   </data>
   <data name="tabPage3.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -1321,49 +1474,49 @@
     <value>613, 17</value>
   </metadata>
   <data name="showGroupNamesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>185, 22</value>
+    <value>218, 26</value>
   </data>
   <data name="showGroupNamesToolStripMenuItem.Text" xml:space="preserve">
     <value>Show &amp;Group Names</value>
   </data>
   <data name="showOfflineDevicesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>185, 22</value>
+    <value>218, 26</value>
   </data>
   <data name="showOfflineDevicesToolStripMenuItem.Text" xml:space="preserve">
     <value>Show &amp;Offline Devices</value>
   </data>
   <data name="toolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 6</value>
+    <value>215, 6</value>
   </data>
   <data name="sortByNameToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>185, 22</value>
+    <value>218, 26</value>
   </data>
   <data name="sortByNameToolStripMenuItem.Text" xml:space="preserve">
     <value>Sort by &amp;Name</value>
   </data>
   <data name="sortByGroupToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>185, 22</value>
+    <value>218, 26</value>
   </data>
   <data name="sortByGroupToolStripMenuItem.Text" xml:space="preserve">
     <value>Sort by G&amp;roup</value>
   </data>
   <data name="toolStripMenuItem4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 6</value>
+    <value>215, 6</value>
   </data>
   <data name="settingsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>185, 22</value>
+    <value>218, 26</value>
   </data>
   <data name="settingsToolStripMenuItem.Text" xml:space="preserve">
     <value>S&amp;ettings...</value>
   </data>
   <data name="customAppsToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>185, 22</value>
+    <value>218, 26</value>
   </data>
   <data name="customAppsToolStripMenuItem1.Text" xml:space="preserve">
     <value>&amp;Custom Apps...</value>
   </data>
   <data name="mainContextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>186, 148</value>
+    <value>219, 172</value>
   </data>
   <data name="&gt;&gt;mainContextMenuStrip.Name" xml:space="preserve">
     <value>mainContextMenuStrip</value>
@@ -1378,10 +1531,13 @@
     <value>NoControl</value>
   </data>
   <data name="menuLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>454, 2</value>
+    <value>608, 2</value>
+  </data>
+  <data name="menuLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="menuLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>25, 25</value>
+    <value>31, 31</value>
   </data>
   <data name="menuLabel.TabIndex" type="System.Int32, mscorlib">
     <value>403</value>
@@ -1405,10 +1561,13 @@
     <value>Top, Right</value>
   </data>
   <data name="searchTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>306, 5</value>
+    <value>411, 6</value>
+  </data>
+  <data name="searchTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="searchTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>146, 20</value>
+    <value>193, 22</value>
   </data>
   <data name="searchTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>402</value>
@@ -1444,10 +1603,13 @@
     <value>NoControl</value>
   </data>
   <data name="cancelAutoCloseButton1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 191</value>
+    <value>8, 226</value>
+  </data>
+  <data name="cancelAutoCloseButton1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="cancelAutoCloseButton1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 35</value>
+    <value>224, 43</value>
   </data>
   <data name="cancelAutoCloseButton1.TabIndex" type="System.Int32, mscorlib">
     <value>405</value>
@@ -1489,82 +1651,82 @@
     <value>Segoe UI, 9pt, style=Bold</value>
   </data>
   <data name="addMapToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>170, 22</value>
+    <value>198, 24</value>
   </data>
   <data name="addMapToolStripMenuItem.Text" xml:space="preserve">
     <value>Add &amp;Map...</value>
   </data>
   <data name="addRelayMapToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>170, 22</value>
+    <value>198, 24</value>
   </data>
   <data name="addRelayMapToolStripMenuItem.Text" xml:space="preserve">
     <value>Add &amp;Relay Map...</value>
   </data>
   <data name="toolStripMenuItem3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>167, 6</value>
+    <value>195, 6</value>
   </data>
   <data name="askConsentBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>171, 22</value>
+    <value>204, 26</value>
   </data>
   <data name="askConsentBarToolStripMenuItem.Text" xml:space="preserve">
     <value>Ask Consent + Bar</value>
   </data>
   <data name="askConsentToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>171, 22</value>
+    <value>204, 26</value>
   </data>
   <data name="askConsentToolStripMenuItem.Text" xml:space="preserve">
     <value>Ask Consent</value>
   </data>
   <data name="privacyBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>171, 22</value>
+    <value>204, 26</value>
   </data>
   <data name="privacyBarToolStripMenuItem.Text" xml:space="preserve">
     <value>Privacy Bar</value>
   </data>
   <data name="remoteDesktopToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>170, 22</value>
+    <value>198, 24</value>
   </data>
   <data name="remoteDesktopToolStripMenuItem.Text" xml:space="preserve">
     <value>Remote Desktop...</value>
   </data>
   <data name="remoteFilesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>170, 22</value>
+    <value>198, 24</value>
   </data>
   <data name="remoteFilesToolStripMenuItem.Text" xml:space="preserve">
     <value>Remote Files...</value>
   </data>
   <data name="httpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>170, 22</value>
+    <value>198, 24</value>
   </data>
   <data name="httpToolStripMenuItem.Text" xml:space="preserve">
     <value>HTTP</value>
   </data>
   <data name="httpsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>170, 22</value>
+    <value>198, 24</value>
   </data>
   <data name="httpsToolStripMenuItem.Text" xml:space="preserve">
     <value>HTTPS</value>
   </data>
   <data name="rdpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>170, 22</value>
+    <value>198, 24</value>
   </data>
   <data name="rdpToolStripMenuItem.Text" xml:space="preserve">
     <value>RDP</value>
   </data>
   <data name="sshToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>170, 22</value>
+    <value>198, 24</value>
   </data>
   <data name="sshToolStripMenuItem.Text" xml:space="preserve">
     <value>SSH</value>
   </data>
   <data name="scpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>170, 22</value>
+    <value>198, 24</value>
   </data>
   <data name="scpToolStripMenuItem.Text" xml:space="preserve">
     <value>SCP</value>
   </data>
   <data name="devicesContextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>171, 208</value>
+    <value>199, 226</value>
   </data>
   <data name="&gt;&gt;devicesContextMenuStrip.Name" xml:space="preserve">
     <value>devicesContextMenuStrip</value>
@@ -1580,7 +1742,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADg
-        HQAAAk1TRnQBSQFMAgEBEAEAARgBAQEYAQEBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        HQAAAk1TRnQBSQFMAgEBEAEAASgBAQEoAQEBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABUAMAAQEBAAEYBgABPP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AJYAA/0D+AP3A/sD/yEAA/0D+gP5
         A/wD/xgAAfoB+wH6A/4qAAP9A/8tAAP7A88D1QPbA88D1AO+A9QYAAP8A90D4APjA90D4APUA+MSAAP8
         AZEBjwF9AU4BaAEhAfQB9QH0JAAD/gPRA8YD+ioAAcYCxwHPAtAB2ALZA90DywPBA68DmgP3FQAD2APd
@@ -1711,10 +1873,13 @@
 </value>
   </data>
   <data name="devicesListView.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 4</value>
+    <value>13, 5</value>
+  </data>
+  <data name="devicesListView.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="devicesListView.Size" type="System.Drawing.Size, System.Drawing">
-    <value>446, 210</value>
+    <value>593, 258</value>
   </data>
   <data name="devicesListView.TabIndex" type="System.Int32, mscorlib">
     <value>404</value>
@@ -1726,7 +1891,7 @@
     <value>devicesListView</value>
   </data>
   <data name="&gt;&gt;devicesListView.Type" xml:space="preserve">
-    <value>MeshCentralRouter.ListViewExtended, MeshCentralRouter, Version=1.8.8219.36334, Culture=neutral, PublicKeyToken=null</value>
+    <value>MeshCentralRouter.ListViewExtended, MeshCentralRouter, Version=1.8.8332.12419, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;devicesListView.Parent" xml:space="preserve">
     <value>devicesPanel</value>
@@ -1744,10 +1909,13 @@
     <value>NoControl</value>
   </data>
   <data name="noSearchResultsLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>2, 88</value>
+    <value>3, 108</value>
+  </data>
+  <data name="noSearchResultsLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="noSearchResultsLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>372, 52</value>
+    <value>490, 64</value>
   </data>
   <data name="noSearchResultsLabel.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -1783,10 +1951,13 @@
     <value>NoControl</value>
   </data>
   <data name="noDevicesLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>2, 88</value>
+    <value>3, 108</value>
+  </data>
+  <data name="noDevicesLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="noDevicesLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>372, 52</value>
+    <value>490, 64</value>
   </data>
   <data name="noDevicesLabel.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -1812,8 +1983,11 @@
   <data name="devicesPanel.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="devicesPanel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="devicesPanel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>470, 248</value>
+    <value>628, 305</value>
   </data>
   <data name="devicesPanel.TabIndex" type="System.Int32, mscorlib">
     <value>50</value>
@@ -1831,13 +2005,16 @@
     <value>0</value>
   </data>
   <data name="devicesTabPage.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 25</value>
+    <value>4, 28</value>
+  </data>
+  <data name="devicesTabPage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="devicesTabPage.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 3, 3, 3</value>
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="devicesTabPage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>470, 250</value>
+    <value>632, 315</value>
   </data>
   <data name="devicesTabPage.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -1864,10 +2041,13 @@
     <value>NoControl</value>
   </data>
   <data name="cancelAutoCloseButton2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 182</value>
+    <value>5, 221</value>
+  </data>
+  <data name="cancelAutoCloseButton2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="cancelAutoCloseButton2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 35</value>
+    <value>224, 43</value>
   </data>
   <data name="cancelAutoCloseButton2.TabIndex" type="System.Int32, mscorlib">
     <value>55</value>
@@ -1906,10 +2086,13 @@
     <value>NoControl</value>
   </data>
   <data name="noMapLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 79</value>
+    <value>8, 97</value>
+  </data>
+  <data name="noMapLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="noMapLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>446, 52</value>
+    <value>586, 64</value>
   </data>
   <data name="noMapLabel.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -1937,8 +2120,11 @@ Click "Add" to get started.</value>
   <data name="mapPanel.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="mapPanel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="mapPanel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>472, 221</value>
+    <value>628, 268</value>
   </data>
   <data name="mapPanel.TabIndex" type="System.Int32, mscorlib">
     <value>49</value>
@@ -1962,10 +2148,13 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="settingsPictureBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>1, 226</value>
+    <value>1, 275</value>
+  </data>
+  <data name="settingsPictureBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="settingsPictureBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>20, 20</value>
+    <value>27, 25</value>
   </data>
   <data name="settingsPictureBox.TabIndex" type="System.Int32, mscorlib">
     <value>54</value>
@@ -1989,10 +2178,13 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="helpPictureBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>240, 226</value>
+    <value>320, 275</value>
+  </data>
+  <data name="helpPictureBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="helpPictureBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>20, 20</value>
+    <value>27, 25</value>
   </data>
   <data name="helpPictureBox.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -2019,10 +2211,13 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="addButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>372, 223</value>
+    <value>496, 271</value>
+  </data>
+  <data name="addButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="addButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
+    <value>133, 28</value>
   </data>
   <data name="addButton.TabIndex" type="System.Int32, mscorlib">
     <value>50</value>
@@ -2052,10 +2247,13 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="addRelayButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>266, 223</value>
+    <value>355, 271</value>
+  </data>
+  <data name="addRelayButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="addRelayButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
+    <value>133, 28</value>
   </data>
   <data name="addRelayButton.TabIndex" type="System.Int32, mscorlib">
     <value>52</value>
@@ -2076,13 +2274,16 @@ Click "Add" to get started.</value>
     <value>5</value>
   </data>
   <data name="portMapTabPage.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 25</value>
+    <value>4, 28</value>
+  </data>
+  <data name="portMapTabPage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="portMapTabPage.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 3, 3, 3</value>
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="portMapTabPage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>472, 253</value>
+    <value>632, 315</value>
   </data>
   <data name="portMapTabPage.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -2103,10 +2304,13 @@ Click "Add" to get started.</value>
     <value>1</value>
   </data>
   <data name="devicesTabControl.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
+    <value>4, 4</value>
+  </data>
+  <data name="devicesTabControl.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="devicesTabControl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>478, 279</value>
+    <value>640, 347</value>
   </data>
   <data name="devicesTabControl.TabIndex" type="System.Int32, mscorlib">
     <value>401</value>
@@ -2130,10 +2334,13 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="openWebSiteButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 291</value>
+    <value>13, 362</value>
+  </data>
+  <data name="openWebSiteButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="openWebSiteButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>109, 23</value>
+    <value>145, 28</value>
   </data>
   <data name="openWebSiteButton.TabIndex" type="System.Int32, mscorlib">
     <value>406</value>
@@ -2163,10 +2370,13 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="backButton5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>276, 291</value>
+    <value>371, 362</value>
+  </data>
+  <data name="backButton5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="backButton5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 23</value>
+    <value>127, 28</value>
   </data>
   <data name="backButton5.TabIndex" type="System.Int32, mscorlib">
     <value>407</value>
@@ -2193,10 +2403,13 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="nextButton5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>378, 291</value>
+    <value>507, 362</value>
+  </data>
+  <data name="nextButton5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="nextButton5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 23</value>
+    <value>127, 28</value>
   </data>
   <data name="nextButton5.TabIndex" type="System.Int32, mscorlib">
     <value>408</value>
@@ -2223,10 +2436,13 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="pictureBox7.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 282</value>
+    <value>0, 351</value>
+  </data>
+  <data name="pictureBox7.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="pictureBox7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>484, 40</value>
+    <value>648, 49</value>
   </data>
   <data name="pictureBox7.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -2252,8 +2468,11 @@ Click "Add" to get started.</value>
   <data name="panel4.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="panel4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="panel4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>484, 322</value>
+    <value>648, 400</value>
   </data>
   <data name="panel4.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -2271,10 +2490,13 @@ Click "Add" to get started.</value>
     <value>0</value>
   </data>
   <data name="tabPage5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 25</value>
+    <value>4, 28</value>
+  </data>
+  <data name="tabPage5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="tabPage5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>484, 322</value>
+    <value>648, 400</value>
   </data>
   <data name="tabPage5.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -2304,7 +2526,7 @@ Click "Add" to get started.</value>
     <value>0, 0, 0, 0</value>
   </data>
   <data name="mainTabControl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>492, 351</value>
+    <value>656, 432</value>
   </data>
   <data name="mainTabControl.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -2328,10 +2550,13 @@ Click "Add" to get started.</value>
     <value>Fill</value>
   </data>
   <data name="mainPanel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 65</value>
+    <value>0, 80</value>
+  </data>
+  <data name="mainPanel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="mainPanel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>492, 351</value>
+    <value>656, 432</value>
   </data>
   <data name="mainPanel.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
@@ -2357,8 +2582,11 @@ Click "Add" to get started.</value>
   <data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="pictureBox1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>492, 65</value>
+    <value>656, 80</value>
   </data>
   <data name="pictureBox1.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>Zoom</value>
@@ -2384,8 +2612,11 @@ Click "Add" to get started.</value>
   <data name="panel5.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="panel5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="panel5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>492, 416</value>
+    <value>656, 512</value>
   </data>
   <data name="panel5.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -2415,22 +2646,22 @@ Click "Add" to get started.</value>
     <value>418, 17</value>
   </metadata>
   <data name="openToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>112, 22</value>
+    <value>123, 24</value>
   </data>
   <data name="openToolStripMenuItem.Text" xml:space="preserve">
     <value>&amp;Open...</value>
   </data>
   <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>109, 6</value>
+    <value>120, 6</value>
   </data>
   <data name="exitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>112, 22</value>
+    <value>123, 24</value>
   </data>
   <data name="exitToolStripMenuItem.Text" xml:space="preserve">
     <value>E&amp;xit</value>
   </data>
   <data name="trayIconContextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 54</value>
+    <value>124, 58</value>
   </data>
   <data name="&gt;&gt;trayIconContextMenuStrip.Name" xml:space="preserve">
     <value>trayIconContextMenuStrip</value>
@@ -4142,34 +4373,34 @@ Click "Add" to get started.</value>
     <value>905, 17</value>
   </metadata>
   <data name="openMappingsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 22</value>
+    <value>193, 24</value>
   </data>
   <data name="openMappingsToolStripMenuItem.Text" xml:space="preserve">
     <value>&amp;Open Mappings...</value>
   </data>
   <data name="saveMappingsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 22</value>
+    <value>193, 24</value>
   </data>
   <data name="saveMappingsToolStripMenuItem.Text" xml:space="preserve">
     <value>&amp;Save Mappings...</value>
   </data>
   <data name="toolStripMenuItem5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>165, 6</value>
+    <value>190, 6</value>
   </data>
   <data name="settingsToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 22</value>
+    <value>193, 24</value>
   </data>
   <data name="settingsToolStripMenuItem1.Text" xml:space="preserve">
     <value>S&amp;ettings...</value>
   </data>
   <data name="customAppsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 22</value>
+    <value>193, 24</value>
   </data>
   <data name="customAppsToolStripMenuItem.Text" xml:space="preserve">
     <value>&amp;Custom Apps...</value>
   </data>
   <data name="mappingsContextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>169, 98</value>
+    <value>194, 106</value>
   </data>
   <data name="&gt;&gt;mappingsContextMenuStrip.Name" xml:space="preserve">
     <value>mappingsContextMenuStrip</value>
@@ -4199,10 +4430,10 @@ Click "Add" to get started.</value>
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
+    <value>8, 16</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>492, 416</value>
+    <value>656, 512</value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -5898,6 +6129,9 @@ Click "Add" to get started.</value>
         AADAPwAAwD8AAMA/AADAPwAA
 </value>
   </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value> MeshCentral Router</value>
   </data>
diff --git a/src/MeshCentralServer.cs b/src/MeshCentralServer.cs
index ca0195c..3306841 100644
--- a/src/MeshCentralServer.cs
+++ b/src/MeshCentralServer.cs
@@ -46,6 +46,8 @@ namespace MeshCentralRouter
         public bool disconnectEmail2FASent = false;
         public bool disconnectSms2FA = false;
         public bool disconnectSms2FASent = false;
+        public bool disconnectMsg2FA = false;
+        public bool disconnectMsg2FASent = false;
         public X509Certificate2 disconnectCert;
         public string authCookie = null;
         public string rauthCookie = null;
@@ -247,6 +249,8 @@ namespace MeshCentralRouter
                             if (jsonAction.ContainsKey("email2fasent")) { disconnectEmail2FASent = (bool)jsonAction["email2fasent"]; } else { disconnectEmail2FASent = false; }
                             if (jsonAction.ContainsKey("sms2fa")) { disconnectSms2FA = (bool)jsonAction["sms2fa"]; } else { disconnectSms2FA = false; }
                             if (jsonAction.ContainsKey("sms2fasent")) { disconnectSms2FASent = (bool)jsonAction["sms2fasent"]; } else { disconnectSms2FASent = false; }
+                            if (jsonAction.ContainsKey("msg2fa")) { disconnectMsg2FA = (bool)jsonAction["msg2fa"]; } else { disconnectMsg2FA = false; }
+                            if (jsonAction.ContainsKey("msg2fasent")) { disconnectMsg2FASent = (bool)jsonAction["msg2fasent"]; } else { disconnectMsg2FASent = false; }
                             if (jsonAction.ContainsKey("twoFactorCookieDays") && (jsonAction["twoFactorCookieDays"].GetType() == typeof(int))) { twoFactorCookieDays = (int)jsonAction["twoFactorCookieDays"]; }
                             break;
                         }