diff --git a/package.json b/package.json
index c7126152..a7415f28 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "1.0.50",
+  "version": "1.0.51",
   "keywords": [
     "Remote Device Management",
     "Remote Device Monitoring",
diff --git a/translate/translate.json b/translate/translate.json
index 7f8c9310..406ed277 100644
--- a/translate/translate.json
+++ b/translate/translate.json
@@ -5223,7 +5223,7 @@
       "zh-chs": "访问被拒绝。",
       "zh-cht": "訪問被拒絕。",
       "xloc": [
-        "login2.handlebars->7->31"
+        "login2.handlebars->7->32"
       ]
     },
     {
@@ -12280,6 +12280,14 @@
         "default.handlebars->container->column_l->p11->7->p11capslock"
       ]
     },
+    {
+      "en": "CAPTCHA image",
+      "xloc": [
+        "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->createpanel->1->1->9->1",
+        "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1",
+        "login2.handlebars->centralTable->1->0->logincell->createpanel->createpanelform->9->1"
+      ]
+    },
     {
       "cs": "CCM",
       "da": "CCM",
@@ -16744,7 +16752,7 @@
         "default-mobile.handlebars->11->471",
         "default.handlebars->45->1339",
         "default.handlebars->45->1356",
-        "login2.handlebars->7->32"
+        "login2.handlebars->7->33"
       ]
     },
     {
@@ -17613,9 +17621,9 @@
       "zh-cht": "創建帳號",
       "xloc": [
         "default.handlebars->45->2485",
-        "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->createpanel->1->1->9->1->12->1->1",
-        "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1->12->1->1",
-        "login2.handlebars->centralTable->1->0->logincell->createpanel->createpanelform->9->1->12->1->1"
+        "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->createpanel->1->1->9->1->16->1->1",
+        "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1->16->1->1",
+        "login2.handlebars->centralTable->1->0->logincell->createpanel->createpanelform->9->1->16->1->1"
       ]
     },
     {
@@ -24692,13 +24700,13 @@
         "default.handlebars->45->2665",
         "default.handlebars->45->2697",
         "default.handlebars->45->494",
-        "login-mobile.handlebars->5->42",
+        "login-mobile.handlebars->5->45",
         "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->tokenpanel->1->7->1->4->1->3",
-        "login.handlebars->5->44",
+        "login.handlebars->5->46",
         "login.handlebars->container->column_l->centralTable->1->0->logincell->resettokenpanel->1->5->1->2->1->3",
         "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->7->1->4->1->3",
-        "login2.handlebars->7->26",
-        "login2.handlebars->7->53",
+        "login2.handlebars->7->27",
+        "login2.handlebars->7->54",
         "login2.handlebars->centralTable->1->0->logincell->resetpanel->resetpanelform->7->1->0->1",
         "login2.handlebars->centralTable->1->0->logincell->resetpanel->resetpanelform->7->1->0->1",
         "login2.handlebars->centralTable->1->0->logincell->resettokenpanel->resettokenpanelform->5->1->2farow2->1->3",
@@ -24779,9 +24787,9 @@
       "zh-chs": "电邮确认",
       "zh-cht": "電郵確認",
       "xloc": [
-        "login-mobile.handlebars->5->43",
-        "login.handlebars->5->45",
-        "login2.handlebars->7->54"
+        "login-mobile.handlebars->5->46",
+        "login.handlebars->5->47",
+        "login2.handlebars->7->55"
       ]
     },
     {
@@ -25256,10 +25264,10 @@
       "zh-chs": "电邮：",
       "zh-cht": "電郵：",
       "xloc": [
-        "login-mobile.handlebars->5->21",
+        "login-mobile.handlebars->5->24",
         "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->createpanel->1->1->9->1->2->1",
         "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->resetpanel->1->7->1->0->1",
-        "login.handlebars->5->22",
+        "login.handlebars->5->24",
         "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1->2->nuEmail",
         "login.handlebars->container->column_l->centralTable->1->0->logincell->resetpanel->1->7->1->0->1",
         "login2.handlebars->centralTable->1->0->logincell->createpanel->createpanelform->9->1->2->nuEmail"
@@ -27312,7 +27320,7 @@
       "zh-chs": "发送请求失败。",
       "zh-cht": "發送請求失敗。",
       "xloc": [
-        "login2.handlebars->7->29"
+        "login2.handlebars->7->30"
       ]
     },
     {
@@ -28579,9 +28587,9 @@
       "zh-chs": "忘记了密码？",
       "zh-cht": "忘記了密碼？",
       "xloc": [
-        "login-mobile.handlebars->5->22",
-        "login.handlebars->5->23",
-        "login2.handlebars->7->27"
+        "login-mobile.handlebars->5->25",
+        "login.handlebars->5->25",
+        "login2.handlebars->7->28"
       ]
     },
     {
@@ -29900,12 +29908,12 @@
       "zh-chs": "好的密码",
       "zh-cht": "好的密碼",
       "xloc": [
-        "login-mobile.handlebars->5->29",
-        "login-mobile.handlebars->5->33",
-        "login.handlebars->5->30",
-        "login.handlebars->5->34",
-        "login2.handlebars->7->39",
-        "login2.handlebars->7->43"
+        "login-mobile.handlebars->5->32",
+        "login-mobile.handlebars->5->36",
+        "login.handlebars->5->32",
+        "login.handlebars->5->36",
+        "login2.handlebars->7->40",
+        "login2.handlebars->7->44"
       ]
     },
     {
@@ -35232,6 +35240,14 @@
         "default.handlebars->45->310"
       ]
     },
+    {
+      "en": "Invalid security check.",
+      "xloc": [
+        "login-mobile.handlebars->5->22",
+        "login.handlebars->5->22",
+        "login2.handlebars->7->24"
+      ]
+    },
     {
       "cs": "Neplatná oprávnění webu",
       "da": "Ugyldige webstedstilladelser",
@@ -41128,9 +41144,9 @@
       "zh-chs": "最大长度为{0}",
       "zh-cht": "最大長度為{0}",
       "xloc": [
-        "login-mobile.handlebars->5->37",
-        "login.handlebars->5->38",
-        "login2.handlebars->7->47"
+        "login-mobile.handlebars->5->40",
+        "login.handlebars->5->40",
+        "login2.handlebars->7->48"
       ]
     },
     {
@@ -42543,9 +42559,9 @@
       "zh-chs": "最小长度为{0}",
       "zh-cht": "最小長度為{0}",
       "xloc": [
-        "login-mobile.handlebars->5->36",
-        "login.handlebars->5->37",
-        "login2.handlebars->7->46"
+        "login-mobile.handlebars->5->39",
+        "login.handlebars->5->39",
+        "login2.handlebars->7->47"
       ]
     },
     {
@@ -48437,9 +48453,9 @@
       "zh-chs": "密码提示",
       "zh-cht": "密碼提示",
       "xloc": [
-        "login-mobile.handlebars->5->27",
-        "login.handlebars->5->28",
-        "login2.handlebars->7->37",
+        "login-mobile.handlebars->5->30",
+        "login.handlebars->5->30",
+        "login2.handlebars->7->38",
         "login2.handlebars->centralTable->1->0->logincell->loginpanel->loginpanelform->loginuserpassdiv->1->1->4->1"
       ]
     },
@@ -48494,14 +48510,14 @@
       "zh-chs": "密码政策",
       "zh-cht": "密碼政策",
       "xloc": [
-        "login-mobile.handlebars->5->31",
-        "login-mobile.handlebars->5->35",
-        "login.handlebars->5->32",
-        "login.handlebars->5->36",
-        "login.handlebars->5->43",
-        "login2.handlebars->7->41",
-        "login2.handlebars->7->45",
-        "login2.handlebars->7->52"
+        "login-mobile.handlebars->5->34",
+        "login-mobile.handlebars->5->38",
+        "login.handlebars->5->34",
+        "login.handlebars->5->38",
+        "login.handlebars->5->45",
+        "login2.handlebars->7->42",
+        "login2.handlebars->7->46",
+        "login2.handlebars->7->53"
       ]
     },
     {
@@ -52794,10 +52810,10 @@
       "zh-chs": "记住此设备{0}天。",
       "zh-cht": "記住此裝置{0}天。",
       "xloc": [
-        "login-mobile.handlebars->5->20",
-        "login.handlebars->5->21",
-        "login2.handlebars->7->24",
-        "login2.handlebars->7->25"
+        "login-mobile.handlebars->5->23",
+        "login.handlebars->5->23",
+        "login2.handlebars->7->25",
+        "login2.handlebars->7->26"
       ]
     },
     {
@@ -55117,7 +55133,7 @@
       "zh-chs": "请求已接受。",
       "zh-cht": "請求已接受。",
       "xloc": [
-        "login2.handlebars->7->30"
+        "login2.handlebars->7->31"
       ]
     },
     {
@@ -55186,7 +55202,7 @@
       "zh-chs": "请求已发送，{0}。",
       "zh-cht": "請求已發送，{0}。",
       "xloc": [
-        "login2.handlebars->7->28"
+        "login2.handlebars->7->29"
       ]
     },
     {
@@ -57801,12 +57817,12 @@
       "zh-chs": "安全登录",
       "zh-cht": "安全登入",
       "xloc": [
-        "login-mobile.handlebars->5->23",
-        "login-mobile.handlebars->5->25",
-        "login.handlebars->5->24",
+        "login-mobile.handlebars->5->26",
+        "login-mobile.handlebars->5->28",
         "login.handlebars->5->26",
-        "login2.handlebars->7->33",
-        "login2.handlebars->7->35"
+        "login.handlebars->5->28",
+        "login2.handlebars->7->34",
+        "login2.handlebars->7->36"
       ]
     },
     {
@@ -57867,6 +57883,14 @@
         "default.handlebars->container->column_l->p21->p21main->1->1->meshSecurityChartDiv->1"
       ]
     },
+    {
+      "en": "Security Check:",
+      "xloc": [
+        "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->createpanel->1->1->9->1->newAccountCaptcha->nuCaptcha",
+        "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1->newAccountCaptcha->nuCaptcha",
+        "login2.handlebars->centralTable->1->0->logincell->createpanel->createpanelform->9->1->newAccountCaptcha->nuCaptcha"
+      ]
+    },
     {
       "cs": "Klíč zabezpečení",
       "da": "Sikkerhedsnøgle",
@@ -57918,6 +57942,14 @@
         "default.handlebars->45->2873"
       ]
     },
+    {
+      "en": "Security check",
+      "xloc": [
+        "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->createpanel->1->1->9->1",
+        "login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1",
+        "login2.handlebars->centralTable->1->0->logincell->createpanel->createpanelform->9->1"
+      ]
+    },
     {
       "cs": "Hledám",
       "da": "Søger",
@@ -58692,7 +58724,7 @@
       "zh-chs": "将令牌发送到注册的电子邮件地址？",
       "zh-cht": "將令牌發送到註冊的電子郵件地址？",
       "xloc": [
-        "login-mobile.handlebars->5->24"
+        "login-mobile.handlebars->5->27"
       ]
     },
     {
@@ -58717,7 +58749,7 @@
       "zh-chs": "将令牌发送到注册电话号码？",
       "zh-cht": "將令牌發送到註冊電話號碼？",
       "xloc": [
-        "login-mobile.handlebars->5->26"
+        "login-mobile.handlebars->5->29"
       ]
     },
     {
@@ -58742,8 +58774,8 @@
       "zh-chs": "将保安编码发送到注册的电邮地址？",
       "zh-cht": "將保安編碼發送到註冊的電郵地址？",
       "xloc": [
-        "login.handlebars->5->25",
-        "login2.handlebars->7->34"
+        "login.handlebars->5->27",
+        "login2.handlebars->7->35"
       ]
     },
     {
@@ -58768,8 +58800,8 @@
       "zh-chs": "将保安编码发送到注册电话号码？",
       "zh-cht": "將保安編碼發送到註冊電話號碼？",
       "xloc": [
-        "login.handlebars->5->27",
-        "login2.handlebars->7->36"
+        "login.handlebars->5->29",
+        "login2.handlebars->7->37"
       ]
     },
     {
@@ -59630,6 +59662,7 @@
       "zh-chs": "服务器正在维护中。",
       "zh-cht": "服務器正在維護中。",
       "xloc": [
+        "login-mobile.handlebars->5->20",
         "login.handlebars->5->20",
         "login2.handlebars->7->22"
       ]
@@ -63860,12 +63893,12 @@
       "zh-chs": "强密码",
       "zh-cht": "強密碼",
       "xloc": [
-        "login-mobile.handlebars->5->28",
-        "login-mobile.handlebars->5->32",
-        "login.handlebars->5->29",
-        "login.handlebars->5->33",
-        "login2.handlebars->7->38",
-        "login2.handlebars->7->42"
+        "login-mobile.handlebars->5->31",
+        "login-mobile.handlebars->5->35",
+        "login.handlebars->5->31",
+        "login.handlebars->5->35",
+        "login2.handlebars->7->39",
+        "login2.handlebars->7->43"
       ]
     },
     {
@@ -68421,6 +68454,8 @@
       "zh-chs": "无法发送设备通知。",
       "zh-cht": "無法發送設備通知。",
       "xloc": [
+        "login-mobile.handlebars->5->21",
+        "login.handlebars->5->21",
         "login2.handlebars->7->23"
       ]
     },
@@ -72345,12 +72380,12 @@
       "zh-chs": "密码强度低",
       "zh-cht": "密碼強度低",
       "xloc": [
-        "login-mobile.handlebars->5->30",
-        "login-mobile.handlebars->5->34",
-        "login.handlebars->5->31",
-        "login.handlebars->5->35",
-        "login2.handlebars->7->40",
-        "login2.handlebars->7->44"
+        "login-mobile.handlebars->5->33",
+        "login-mobile.handlebars->5->37",
+        "login.handlebars->5->33",
+        "login.handlebars->5->37",
+        "login2.handlebars->7->41",
+        "login2.handlebars->7->45"
       ]
     },
     {
@@ -77885,9 +77920,9 @@
       "zh-chs": "{0}小写",
       "zh-cht": "{0}小寫",
       "xloc": [
-        "login-mobile.handlebars->5->39",
-        "login.handlebars->5->40",
-        "login2.handlebars->7->49"
+        "login-mobile.handlebars->5->42",
+        "login.handlebars->5->42",
+        "login2.handlebars->7->50"
       ]
     },
     {
@@ -78084,9 +78119,9 @@
       "zh-chs": "{0}非字母数字",
       "zh-cht": "{0}非字母數字",
       "xloc": [
-        "login-mobile.handlebars->5->41",
-        "login.handlebars->5->42",
-        "login2.handlebars->7->51"
+        "login-mobile.handlebars->5->44",
+        "login.handlebars->5->44",
+        "login2.handlebars->7->52"
       ]
     },
     {
@@ -78111,9 +78146,9 @@
       "zh-chs": "{0}数字",
       "zh-cht": "{0}數字",
       "xloc": [
-        "login-mobile.handlebars->5->40",
-        "login.handlebars->5->41",
-        "login2.handlebars->7->50"
+        "login-mobile.handlebars->5->43",
+        "login.handlebars->5->43",
+        "login2.handlebars->7->51"
       ]
     },
     {
@@ -78614,9 +78649,9 @@
       "zh-chs": "{0}大写",
       "zh-cht": "{0}大寫",
       "xloc": [
-        "login-mobile.handlebars->5->38",
-        "login.handlebars->5->39",
-        "login2.handlebars->7->48"
+        "login-mobile.handlebars->5->41",
+        "login.handlebars->5->41",
+        "login2.handlebars->7->49"
       ]
     },
     {
diff --git a/views/login-mobile.handlebars b/views/login-mobile.handlebars
index dbef92ab..861b92bd 100644
--- a/views/login-mobile.handlebars
+++ b/views/login-mobile.handlebars
@@ -131,6 +131,14 @@
                                                 <td align=right>Creation Token:</td>
                                                 <td><input id=anewaccountpass type=password name=anewaccountpass autocomplete=off maxlength=256 onkeydown=haltReturn(event) onchange=validateCreate(6) onkeyup=validateCreate(6,event) /></td>
                                             </tr>
+                                            <tr id=newAccountCaptchaImg title="CAPTCHA image">
+                                                <td></td>
+                                                <td colspan=2><img src="{{{newAccountCaptchaImage}}}" loading="lazy" /></td>
+                                            </tr>
+                                            <tr id=newAccountCaptcha title="Security check">
+                                                <td id="nuCaptcha" align=right>Security Check:</td>
+                                                <td><input id=anewaccountcaptcha type=text name=anewaccountcaptcha {{{autocomplete}}}=off maxlength=256 onkeydown=haltReturn(event) onchange=validateCreate(7,event) onkeyup=validateCreate(7,event) /></td>
+                                            </tr>
                                             <tr>
                                                 <td colspan=2>
                                                     <div style=float:right><input id=createButton type=submit value="Create Account" disabled="disabled" /></div>
@@ -140,6 +148,7 @@
                                         </table>
                                         <hr /><a onclick=xgo(1) style=cursor:pointer>Back to login</a>
                                         <input id=createformargs name="urlargs" type="hidden" value="" />
+                                        <input id=createformcaptcha name="captchaargs" type="hidden" value="{{{newAccountCaptcha}}}" />
                                     </form>
                                 </div>
                             </div>
@@ -316,6 +325,7 @@
         var newAccount = '{{{newAccount}}}';
         var passhint = '{{{passhint}}}';
         var newAccountPass = parseInt('{{{newAccountPass}}}');
+        var newAccountCaptcha = '{{{newAccountCaptcha}}}';
         var emailCheck = '{{{emailcheck}}}';
         var features = parseInt('{{{features}}}');
         var passRequirements = '{{{passRequirements}}}';
@@ -334,7 +344,7 @@
         // Display the right server message
         var messageid = parseInt('{{{messageid}}}');
         var okmessages = ['', "If valid, reset mail sent.", "Email sent.", "Email verification required, check your mailbox and click the confirmation link.", "SMS sent."];
-        var failmessages = ["Unable to create account.", "Account limit reached.", "Existing account with this email address.", "Invalid account creation token.", "Username already exists.", "Password rejected, use a different one.", "Invalid email.", "Account not found.", "Invalid token, try again.", "Unable to sent email.", "Account locked.", "Access denied.", "Login failed, check username and password.", "Password change requested.", "IP address blocked, try again later."];
+        var failmessages = ["Unable to create account.", "Account limit reached.", "Existing account with this email address.", "Invalid account creation token.", "Username already exists.", "Password rejected, use a different one.", "Invalid email.", "Account not found.", "Invalid token, try again.", "Unable to sent email.", "Account locked.", "Access denied.", "Login failed, check username and password.", "Password change requested.", "IP address blocked, try again later.", "Server under maintenance.", "Unable to send device notification.", "Invalid security check."];
         if (messageid > 0) {
             var msg = '';
             if ((messageid < 100) && (messageid < okmessages.length)) { msg = okmessages[messageid]; }
@@ -403,6 +413,8 @@
             QV('newAccountDiv', (newAccount === '1') || (newAccount === 'true')); // If new accounts are not allowed, don't display the new account link.
             if ((passRequirements.hint === true) && (passhint != null) && (passhint.length > 0)) { QV('showPassHintLink', true); }
             QV('newAccountPass', (newAccountPass == 1));
+            QV('newAccountCaptcha', (newAccountCaptcha != ''));
+            QV('newAccountCaptchaImg', (newAccountCaptcha != ''));
             QV('resetAccountDiv', (emailCheck == 'true'));
             QV('hrAccountDiv', (emailCheck == 'true') || (newAccountPass == 1));
 
@@ -592,8 +604,9 @@
                 if (box == 2) { Q('apassword1').focus(); }
                 if (box == 3) { Q('apassword2').focus(); }
                 if (box == 4) { Q('apasswordhint').focus(); }
-                if (box == 5) { if (newAccountPass == 1) { Q('anewaccountpass').focus(); } else { Q('createButton').click(); } }
-                if (box == 6) { Q('createButton').click(); }
+                if (box == 5) { if (newAccountPass == 1) { Q('anewaccountpass').focus(); } else { box = 6; } }
+                if (box == 6) { if (newAccountCaptcha != '') { Q('anewaccountcaptcha').focus(); } else { box = 7; } }
+                if (box == 7) { Q('createButton').click(); }
             }
             if (e != null) { haltEvent(e); }
         }