diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe
index 7a304635..b7c3637e 100644
Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ
diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe
index fef04561..62eb676d 100644
Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ
diff --git a/agents/MeshService-signed.exe b/agents/MeshService-signed.exe
index 9c589309..3741de65 100644
Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ
diff --git a/agents/MeshService.exe b/agents/MeshService.exe
index 6d37ffe5..94fc3711 100644
Binary files a/agents/MeshService.exe and b/agents/MeshService.exe differ
diff --git a/agents/MeshService64-signed.exe b/agents/MeshService64-signed.exe
index 75bdec7c..2c0d5783 100644
Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ
diff --git a/agents/MeshService64.exe b/agents/MeshService64.exe
index 22983e31..fd5a16b3 100644
Binary files a/agents/MeshService64.exe and b/agents/MeshService64.exe differ
diff --git a/agents/agents-old/MeshCmd-signed.exe b/agents/agents-old/MeshCmd-signed.exe
deleted file mode 100644
index b7c3637e..00000000
Binary files a/agents/agents-old/MeshCmd-signed.exe and /dev/null differ
diff --git a/agents/agents-old/MeshCmd64-signed.exe b/agents/agents-old/MeshCmd64-signed.exe
deleted file mode 100644
index 62eb676d..00000000
Binary files a/agents/agents-old/MeshCmd64-signed.exe and /dev/null differ
diff --git a/agents/agents-old/MeshService-signed.exe b/agents/agents-old/MeshService-signed.exe
deleted file mode 100644
index 3741de65..00000000
Binary files a/agents/agents-old/MeshService-signed.exe and /dev/null differ
diff --git a/agents/agents-old/MeshService.exe b/agents/agents-old/MeshService.exe
deleted file mode 100644
index 94fc3711..00000000
Binary files a/agents/agents-old/MeshService.exe and /dev/null differ
diff --git a/agents/agents-old/MeshService64-signed.exe b/agents/agents-old/MeshService64-signed.exe
deleted file mode 100644
index 2c0d5783..00000000
Binary files a/agents/agents-old/MeshService64-signed.exe and /dev/null differ
diff --git a/agents/agents-old/MeshService64.exe b/agents/agents-old/MeshService64.exe
deleted file mode 100644
index fd5a16b3..00000000
Binary files a/agents/agents-old/MeshService64.exe and /dev/null differ
diff --git a/meshuser.js b/meshuser.js
index 83e34875..7ba9b798 100644
--- a/meshuser.js
+++ b/meshuser.js
@@ -5265,7 +5265,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
 
                         // Perform email invitation
                         if ((command.emailInvitation == true) && (command.emailVerified == true) && command.email && domain.mailserver) {
-                            domain.mailserver.sendAccountInviteMail(newuserdomain, (user.realname ? user.realname : user.name), newusername, command.email.toLowerCase(), command.pass, parent.getLanguageCodes(req));
+                            domain.mailserver.sendAccountInviteMail(newuserdomain, (user.realname ? user.realname : user.name), newusername, command.email.toLowerCase(), command.pass, parent.getLanguageCodes(req), req.query.key);
                         }
 
                         // Log in the auth log
@@ -5504,7 +5504,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                     if (parent.parent.authlog) { parent.parent.authLog('https', 'User ' + user.name + ' changed email from ' + oldemail + ' to ' + user.email); }
 
                     // Send the verification email
-                    if (domain.mailserver != null) { domain.mailserver.sendAccountCheckMail(domain, user.name, user._id, user.email, parent.getLanguageCodes(req)); }
+                    if (domain.mailserver != null) { domain.mailserver.sendAccountCheckMail(domain, user.name, user._id, user.email, parent.getLanguageCodes(req), req.query.key); }
                 }
             });
         }
@@ -6100,7 +6100,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
 
         if ((domain.mailserver != null) && (obj.user.email.toLowerCase() == command.email)) {
             // Send the verification email
-            domain.mailserver.sendAccountCheckMail(domain, user.name, user._id, user.email, parent.getLanguageCodes(req));
+            domain.mailserver.sendAccountCheckMail(domain, user.name, user._id, user.email, parent.getLanguageCodes(req), req.query.key);
         }
     }
 
diff --git a/package.json b/package.json
index 5bf0153e..f926492d 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
     "sample-config-advanced.json"
   ],
   "dependencies": {
+    "@yetzt/nedb": "^1.8.0",
     "body-parser": "^1.19.0",
     "cbor": "~5.2.0",
     "compression": "^1.7.4",
@@ -43,10 +44,12 @@
     "express": "^4.17.0",
     "express-handlebars": "^3.1.0",
     "express-ws": "^4.0.0",
+    "html-minifier": "^4.0.0",
     "ipcheck": "^0.1.0",
+    "jsdom": "^19.0.0",
+    "minify-js": "^0.0.4",
     "minimist": "^1.2.5",
     "multiparty": "^4.2.1",
-    "@yetzt/nedb": "^1.8.0",
     "node-forge": "^1.0.0",
     "ws": "^5.2.3",
     "yauzl": "^2.10.0"