diff --git a/social/email/61-email.html b/social/email/61-email.html
index a0267f4a..184191f2 100644
--- a/social/email/61-email.html
+++ b/social/email/61-email.html
@@ -66,7 +66,7 @@
     </div>
     <div class="form-row node-input-token" style="display: none;">
         <label for="node-input-token"><i class="fa fa-lock"></i> <span data-i18n="email.label.token"></span></label>
-        <input type="text" id="node-input-token" placeholder="oauth2Response.access_token">
+        <input type="text" id="node-input-token" placeholder="oauth2Response.access_token" style="width:70%;">
     </div>
     <br/>
     <div class="form-row node-input-useTLS">
@@ -116,6 +116,10 @@
                 this.authtype = "BASIC";
                 $("#node-input-authtype").val('BASIC');
             }
+            if (typeof this.token === 'undefined') {
+                $("#node-input-token").val("oauth2Response.access_token");
+                this.token = "oauth2Response.access_token";
+            }
             $("#node-input-authtype").change(function() {
                 var protocol = $("#node-input-authtype").val();
                 if (protocol === "BASIC") {
@@ -220,7 +224,7 @@
     </div>
     <div class="form-row node-input-token" style="display: none;">
         <label for="node-input-token"><i class="fa fa-lock"></i> <span data-i18n="email.label.token"></span></label>
-        <input type="text" id="node-input-token" placeholder="oauth2Response.access_token">
+        <input type="text" id="node-input-token" placeholder="oauth2Response.access_token" style="width:70%;">
     </div>
     <div class="form-row node-input-box">
         <label for="node-input-box"><i class="fa fa-inbox"></i> <span data-i18n="email.label.folder"></span></label>
@@ -369,6 +373,10 @@
                 $("#node-input-box").val("INBOX");
                 this.box = "INBOX";
             }
+            if (typeof this.token === 'undefined') {
+                $("#node-input-token").val("oauth2Response.access_token");
+                this.token = "oauth2Response.access_token";
+            }
             if (typeof this.criteria === 'undefined') {
                 $("#node-input-criteria").val("UNSEEN");
                 this.criteria = "UNSEEN";
diff --git a/social/email/package.json b/social/email/package.json
index 8a480f76..c7d2ddd7 100644
--- a/social/email/package.json
+++ b/social/email/package.json
@@ -1,13 +1,13 @@
 {
   "name": "node-red-node-email",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Node-RED nodes to send and receive simple emails.",
   "dependencies": {
     "imap": "^0.8.19",
     "node-pop3": "^0.9.0",
-    "mailparser": "^3.6.4",
-    "nodemailer": "^6.9.9",
-    "smtp-server": "^3.13.0"
+    "mailparser": "^3.6.9",
+    "nodemailer": "^6.9.12",
+    "smtp-server": "^3.13.3"
   },
   "bundledDependencies": [
     "imap",