diff --git a/package.json b/package.json
index 41412e1..2918b53 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-matrix-chat",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "description": "Matrix chat server client for Node-RED",
   "dependencies": {
     "fs-extra": "^10.0.1",
diff --git a/src/matrix-delete-event.html b/src/matrix-delete-event.html
index 657fc71..899ac22 100644
--- a/src/matrix-delete-event.html
+++ b/src/matrix-delete-event.html
@@ -32,24 +32,23 @@
         <label for="node-input-roomId"><i class="fa fa-comments"></i> Room ID</label>
         <input type="text" id="node-input-roomId" placeholder="msg.topic">
         <pre class="form-tips" id="node-input-roomId-error" style="color: #721c24;background-color: #f8d7da;border-color: #f5c6cb;margin-bottom: 12px;margin-top: 12px;display:none;"></pre>
-        <script type="text/javascript">
-            $(function(){
-                $("#node-input-roomId").on("keyup", function() {
-                    if($(this).val() && !$(this).val().startsWith("!")) {
-                        $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
-                    } else {
-                        $("#node-input-roomId-error").hide();
-                    }
-                }).trigger('keyup');
-            });
-        </script>
-    </div>
     </div>
     <div class="form-row">
         <label for="node-input-reason"><i class="fa fa-sticky-note"></i> Reason</label>
         <input type="text" id="node-input-reason" placeholder="msg.reason">
     </div>
 
+    <script type="text/javascript">
+        $(function(){
+            $("#node-input-roomId").on("keyup", function() {
+                if($(this).val() && !$(this).val().startsWith("!")) {
+                    $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
+                } else {
+                    $("#node-input-roomId-error").hide();
+                }
+            }).trigger('keyup');
+        });
+    </script>
 </script>
 
 <script type="text/html" data-help-name="matrix-delete-event">
diff --git a/src/matrix-invite-room.html b/src/matrix-invite-room.html
index 13844e3..1294d16 100644
--- a/src/matrix-invite-room.html
+++ b/src/matrix-invite-room.html
@@ -33,19 +33,18 @@
         <label for="node-input-roomId"><i class="fa fa-comments"></i> Room ID</label>
         <input type="text" id="node-input-roomId" placeholder="msg.topic">
         <pre class="form-tips" id="node-input-roomId-error" style="color: #721c24;background-color: #f8d7da;border-color: #f5c6cb;margin-bottom: 12px;margin-top: 12px;display:none;"></pre>
-        <script type="text/javascript">
-            $(function(){
-                $("#node-input-roomId").on("keyup", function() {
-                    if($(this).val() && !$(this).val().startsWith("!")) {
-                        $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
-                    } else {
-                        $("#node-input-roomId-error").hide();
-                    }
-                }).trigger('keyup');
-            });
-        </script>
-    </div>
     </div>
+    <script type="text/javascript">
+        $(function(){
+            $("#node-input-roomId").on("keyup", function() {
+                if($(this).val() && !$(this).val().startsWith("!")) {
+                    $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
+                } else {
+                    $("#node-input-roomId-error").hide();
+                }
+            }).trigger('keyup');
+        });
+    </script>
 </script>
 
 <script type="text/html" data-help-name="matrix-invite-room">
diff --git a/src/matrix-react.html b/src/matrix-react.html
index b38f5ec..b552980 100644
--- a/src/matrix-react.html
+++ b/src/matrix-react.html
@@ -32,23 +32,22 @@
         <label for="node-input-roomId"><i class="fa fa-comments"></i> Room ID</label>
         <input type="text" id="node-input-roomId" placeholder="msg.topic">
         <pre class="form-tips" id="node-input-roomId-error" style="color: #721c24;background-color: #f8d7da;border-color: #f5c6cb;margin-bottom: 12px;margin-top: 12px;display:none;"></pre>
-        <script type="text/javascript">
-            $(function(){
-                $("#node-input-roomId").on("keyup", function() {
-                    if($(this).val() && !$(this).val().startsWith("!")) {
-                        $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
-                    } else {
-                        $("#node-input-roomId-error").hide();
-                    }
-                }).trigger('keyup');
-            });
-        </script>
-    </div>
     </div>
     <div class="form-row">
         <label for="node-input-reaction"><i class="fa fa-thumbs-up"></i> Reaction</label>
         <input type="text" id="node-input-reaction" placeholder="msg.payload">
     </div>
+    <script type="text/javascript">
+        $(function(){
+            $("#node-input-roomId").on("keyup", function() {
+                if($(this).val() && !$(this).val().startsWith("!")) {
+                    $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
+                } else {
+                    $("#node-input-roomId-error").hide();
+                }
+            }).trigger('keyup');
+        });
+    </script>
 </script>
 
 <script type="text/html" data-help-name="matrix-react">
diff --git a/src/matrix-receive.html b/src/matrix-receive.html
index b08a7a7..1b10fd7 100644
--- a/src/matrix-receive.html
+++ b/src/matrix-receive.html
@@ -37,17 +37,6 @@
         <label for="node-input-roomId"><i class="fa fa-comments"></i> Room ID</label>
         <input type="text" id="node-input-roomId">
         <pre class="form-tips" id="node-input-roomId-error" style="color: #721c24;background-color: #f8d7da;border-color: #f5c6cb;margin-bottom: 12px;margin-top: 12px;display:none;"></pre>
-        <script type="text/javascript">
-            $(function(){
-                $("#node-input-roomId").on("keyup", function() {
-                    if($(this).val() && !$(this).val().startsWith("!")) {
-                        $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
-                    } else {
-                        $("#node-input-roomId-error").hide();
-                    }
-                }).trigger('keyup');
-            });
-        </script>
     </div>
     <div class="form-tips">Enter a single room, comma separated list of rooms, or leave blank to get from all</div>
     <div class="form-row" style="margin-left: 100px;margin-top:10px;font-weight:bold;">
@@ -113,6 +102,17 @@
             Accept images <code>m.image</code>
         </label>
     </div>
+    <script type="text/javascript">
+        $(function(){
+            $("#node-input-roomId").on("keyup", function() {
+                if($(this).val() && !$(this).val().startsWith("!")) {
+                    $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
+                } else {
+                    $("#node-input-roomId-error").hide();
+                }
+            }).trigger('keyup');
+        });
+    </script>
 </script>
 
 <script type="text/html" data-help-name="matrix-receive">
diff --git a/src/matrix-room-ban.html b/src/matrix-room-ban.html
index 726a0d1..32bb931 100644
--- a/src/matrix-room-ban.html
+++ b/src/matrix-room-ban.html
@@ -32,23 +32,22 @@
         <label for="node-input-roomId"><i class="fa fa-comments"></i> Room ID</label>
         <input type="text" id="node-input-roomId" placeholder="msg.topic">
         <pre class="form-tips" id="node-input-roomId-error" style="color: #721c24;background-color: #f8d7da;border-color: #f5c6cb;margin-bottom: 12px;margin-top: 12px;display:none;"></pre>
-        <script type="text/javascript">
-            $(function(){
-                $("#node-input-roomId").on("keyup", function() {
-                    if($(this).val() && !$(this).val().startsWith("!")) {
-                        $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
-                    } else {
-                        $("#node-input-roomId-error").hide();
-                    }
-                }).trigger('keyup');
-            });
-        </script>
-    </div>
     </div>
     <div class="form-row">
         <label for="node-input-reason"><i class="fa fa-comment"></i> Reason</label>
         <input type="text" id="node-input-reason" placeholder="msg.topic">
     </div>
+    <script type="text/javascript">
+        $(function(){
+            $("#node-input-roomId").on("keyup", function() {
+                if($(this).val() && !$(this).val().startsWith("!")) {
+                    $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
+                } else {
+                    $("#node-input-roomId-error").hide();
+                }
+            }).trigger('keyup');
+        });
+    </script>
 </script>
 
 <script type="text/html" data-help-name="matrix-room-ban">
diff --git a/src/matrix-room-kick.html b/src/matrix-room-kick.html
index e303335..f0bf0e1 100644
--- a/src/matrix-room-kick.html
+++ b/src/matrix-room-kick.html
@@ -32,23 +32,22 @@
         <label for="node-input-roomId"><i class="fa fa-comments"></i> Room ID</label>
         <input type="text" id="node-input-roomId" placeholder="msg.topic">
         <pre class="form-tips" id="node-input-roomId-error" style="color: #721c24;background-color: #f8d7da;border-color: #f5c6cb;margin-bottom: 12px;margin-top: 12px;display:none;"></pre>
-        <script type="text/javascript">
-            $(function(){
-                $("#node-input-roomId").on("keyup", function() {
-                    if($(this).val() && !$(this).val().startsWith("!")) {
-                        $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
-                    } else {
-                        $("#node-input-roomId-error").hide();
-                    }
-                }).trigger('keyup');
-            });
-        </script>
-    </div>
     </div>
     <div class="form-row">
         <label for="node-input-reason"><i class="fa fa-comment"></i> Reason</label>
         <input type="text" id="node-input-reason" placeholder="msg.topic">
     </div>
+    <script type="text/javascript">
+        $(function(){
+            $("#node-input-roomId").on("keyup", function() {
+                if($(this).val() && !$(this).val().startsWith("!")) {
+                    $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
+                } else {
+                    $("#node-input-roomId-error").hide();
+                }
+            }).trigger('keyup');
+        });
+    </script>
 </script>
 
 <script type="text/html" data-help-name="matrix-room-kick">
diff --git a/src/matrix-room-users.html b/src/matrix-room-users.html
index 27cf138..34e6452 100644
--- a/src/matrix-room-users.html
+++ b/src/matrix-room-users.html
@@ -28,21 +28,21 @@
      	<input type="text" id="node-input-server">
  	</div>
     <div class="form-row">
-        <label for="node-input-server"><i class="fa fa-user"></i> Room Id</label>        <input type="text" id="node-input-roomId" placeholder="msg.topic">
+        <label for="node-input-server"><i class="fa fa-user"></i> Room Id</label>
+        <input type="text" id="node-input-roomId" placeholder="msg.topic">
         <pre class="form-tips" id="node-input-roomId-error" style="color: #721c24;background-color: #f8d7da;border-color: #f5c6cb;margin-bottom: 12px;margin-top: 12px;display:none;"></pre>
-        <script type="text/javascript">
-            $(function(){
-                $("#node-input-roomId").on("keyup", function() {
-                    if($(this).val() && !$(this).val().startsWith("!")) {
-                        $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
-                    } else {
-                        $("#node-input-roomId-error").hide();
-                    }
-                }).trigger('keyup');
-            });
-        </script>
-    </div>
     </div>
+    <script type="text/javascript">
+        $(function(){
+            $("#node-input-roomId").on("keyup", function() {
+                if($(this).val() && !$(this).val().startsWith("!")) {
+                    $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
+                } else {
+                    $("#node-input-roomId-error").hide();
+                }
+            }).trigger('keyup');
+        });
+    </script>
 </script>
 
 <script type="text/html" data-help-name="matrix-room-users">
diff --git a/src/matrix-send-file.html b/src/matrix-send-file.html
index 7355728..e3edac5 100644
--- a/src/matrix-send-file.html
+++ b/src/matrix-send-file.html
@@ -32,18 +32,6 @@
         <label for="node-input-roomId"><i class="fa fa-comments"></i> Room ID</label>
         <input type="text" id="node-input-roomId" placeholder="msg.topic">
         <pre class="form-tips" id="node-input-roomId-error" style="color: #721c24;background-color: #f8d7da;border-color: #f5c6cb;margin-bottom: 12px;margin-top: 12px;display:none;"></pre>
-        <script type="text/javascript">
-            $(function(){
-                $("#node-input-roomId").on("keyup", function() {
-                    if($(this).val() && !$(this).val().startsWith("!")) {
-                        $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
-                    } else {
-                        $("#node-input-roomId-error").hide();
-                    }
-                }).trigger('keyup');
-            });
-        </script>
-    </div>
     </div>
     <div class="form-row">
         <label for="node-input-contentType"><i class="fa fa-user"></i> Content-Type</label>
@@ -52,6 +40,17 @@
     <div class="form-tips">
         Must be a valid <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types" target="_blank">MIME Type</a> (ex: application/pdf) or left empty
     </div>
+    <script type="text/javascript">
+        $(function(){
+            $("#node-input-roomId").on("keyup", function() {
+                if($(this).val() && !$(this).val().startsWith("!")) {
+                    $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
+                } else {
+                    $("#node-input-roomId-error").hide();
+                }
+            }).trigger('keyup');
+        });
+    </script>
 </script>
 
 <script type="text/html" data-help-name="matrix-send-file">
diff --git a/src/matrix-send-image.html b/src/matrix-send-image.html
index aaef024..6d87fee 100644
--- a/src/matrix-send-image.html
+++ b/src/matrix-send-image.html
@@ -32,18 +32,6 @@
         <label for="node-input-roomId"><i class="fa fa-comments"></i> Room ID</label>
         <input type="text" id="node-input-roomId" placeholder="msg.topic">
         <pre class="form-tips" id="node-input-roomId-error" style="color: #721c24;background-color: #f8d7da;border-color: #f5c6cb;margin-bottom: 12px;margin-top: 12px;display:none;"></pre>
-        <script type="text/javascript">
-            $(function(){
-                $("#node-input-roomId").on("keyup", function() {
-                    if($(this).val() && !$(this).val().startsWith("!")) {
-                        $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
-                    } else {
-                        $("#node-input-roomId-error").hide();
-                    }
-                }).trigger('keyup');
-            });
-        </script>
-    </div>
     </div>
     <div class="form-row">
         <label for="node-input-contentType"><i class="fa fa-user"></i> Content-Type</label>
@@ -52,6 +40,17 @@
     <div class="form-tips">
         Must be a valid <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types" target="_blank">MIME Type</a> (ex: image/png) or left empty
     </div>
+    <script type="text/javascript">
+        $(function(){
+            $("#node-input-roomId").on("keyup", function() {
+                if($(this).val() && !$(this).val().startsWith("!")) {
+                    $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
+                } else {
+                    $("#node-input-roomId-error").hide();
+                }
+            }).trigger('keyup');
+        });
+    </script>
 </script>
 
 <script type="text/html" data-help-name="matrix-send-image">
diff --git a/src/matrix-send-message.html b/src/matrix-send-message.html
index ac6d31b..9babaab 100644
--- a/src/matrix-send-message.html
+++ b/src/matrix-send-message.html
@@ -37,18 +37,6 @@
         <label for="node-input-roomId"><i class="fa fa-comments"></i> Room ID</label>
         <input type="text" id="node-input-roomId" placeholder="msg.topic">
         <pre class="form-tips" id="node-input-roomId-error" style="color: #721c24;background-color: #f8d7da;border-color: #f5c6cb;margin-bottom: 12px;margin-top: 12px;display:none;"></pre>
-        <script type="text/javascript">
-            $(function(){
-                $("#node-input-roomId").on("keyup", function() {
-                    if($(this).val() && !$(this).val().startsWith("!")) {
-                        $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
-                    } else {
-                        $("#node-input-roomId-error").hide();
-                    }
-                }).trigger('keyup');
-            });
-        </script>
-    </div>
     </div>
 
     <div class="form-row">
@@ -91,6 +79,17 @@
             <option value="msg.format">msg.format input</option>
         </select>
     </div>
+    <script type="text/javascript">
+        $(function(){
+            $("#node-input-roomId").on("keyup", function() {
+                if($(this).val() && !$(this).val().startsWith("!")) {
+                    $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
+                } else {
+                    $("#node-input-roomId-error").hide();
+                }
+            }).trigger('keyup');
+        });
+    </script>
 </script>
 
 <script type="text/html" data-help-name="matrix-send-message">
diff --git a/src/matrix-server-config.html b/src/matrix-server-config.html
index a36d4b6..fee1d90 100644
--- a/src/matrix-server-config.html
+++ b/src/matrix-server-config.html
@@ -30,7 +30,8 @@
             deviceLabel: { type: "text", required: false },
             accessToken: { type: "password", required: true },
             deviceId: { type: "text", required: false },
-            url: { type: "text", required: true }
+            secretStoragePassphrase: { type: "password", required: false },
+            url: { type: "text", required: true },
         },
         defaults: {
             name: { value: null },
@@ -86,6 +87,14 @@
         You can either provide/generate an access token yourself or use the login button above to do it automatically. View the <a href="javascript:$('#red-ui-tab-help-link-button').click();">node docs</a> to figure out how to generate an Access Token manually. If you generated a user with shared secret registration you will already have an access token you can place here.
     </div>
 
+    <div class="form-row">
+        <label for="node-config-input-secretStoragePassphrase"><i class="fa fa-key"></i> Secret Storage Passphrase</label>
+        <input type="text" id="node-config-input-secretStoragePassphrase">
+    </div>
+    <div class="form-tips" style="margin-bottom: 12px;">
+        You can either provide/generate an access token yourself or use the login button above to do it automatically. View the <a href="javascript:$('#red-ui-tab-help-link-button').click();">node docs</a> to figure out how to generate an Access Token manually. If you generated a user with shared secret registration you will already have an access token you can place here.
+    </div>
+
     <div class="form-row">
         <label for="node-config-input-deviceId"><i class="fa fa-desktop"></i> Device ID</label>
         <input type="text" id="node-config-input-deviceId">
diff --git a/src/matrix-server-config.js b/src/matrix-server-config.js
index 6aca572..99b2c82 100644
--- a/src/matrix-server-config.js
+++ b/src/matrix-server-config.js
@@ -5,6 +5,8 @@ const { resolve } = require('path');
 const { LocalStorage } = require('node-localstorage');
 const { LocalStorageCryptoStore } = require('matrix-js-sdk/lib/crypto/store/localStorage-crypto-store');
 const {RoomEvent, RoomMemberEvent, HttpApiEvent, ClientEvent} = require("matrix-js-sdk");
+const {deriveKey} = require("matrix-js-sdk/lib/crypto/key_passphrase");
+const {encryptAES} = require("matrix-js-sdk/lib/crypto/aes");
 
 module.exports = function(RED) {
     function MatrixFolderNameFromUserId(name) {
@@ -28,10 +30,11 @@ module.exports = function(RED) {
         this.userId = this.credentials.userId;
         this.deviceLabel = this.credentials.deviceLabel || null;
         this.deviceId = this.credentials.deviceId || null;
+        this.secretStoragePassphrase = this.credentials.secretStoragePassphrase || null;
         this.url = this.credentials.url;
         this.autoAcceptRoomInvites = n.autoAcceptRoomInvites;
-        this.enableE2ee = n.enableE2ee || false;
-        this.e2ee = (this.enableE2ee && this.deviceId);
+        this.e2ee = this.enableE2ee = n.enableE2ee || false;
+
         this.globalAccess = n.global;
         this.initializedAt = new Date();
         
@@ -40,6 +43,53 @@ module.exports = function(RED) {
             return;
         }
 
+        let cryptoCallbacks = undefined;
+        if(node.enableE2ee && node.secretStoragePassphrase && false) {
+            // cryptoCallbacks = {
+            //     getSecretStorageKey: async function({ keys }, name) {
+            //         const ZERO_STR = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+            //         for (const [keyName, keyInfo] of Object.entries(keys)) {
+            //             const key = await deriveKey(node.secretStoragePassphrase, keyInfo.passphrase.salt, keyInfo.passphrase.iterations);
+            //             // const key = Uint8Array.of(36, 47, 159, 193, 29, 188, 180, 86, 189, 180, 207, 101, 79, 255, 93, 159, 228, 43, 160, 158, 98, 209, 84, 196, 137, 122, 119, 118, 11, 131, 75, 87);
+            //             const { mac } = await encryptAES(ZERO_STR, key, "", keyInfo.iv);
+            //             if (keyInfo.mac.replace(/=+$/g, '') === mac.replace(/=+$/g, '')) {
+            //                 return [keyName, key];
+            //             }
+            //         }
+            //         return null;
+            //     },
+            //     async getDehydrationKey() {
+            //         return node.secretStoragePassphrase;
+            //     },
+            //     async generateDehydrationKey() {
+            //         return {key: node.secretStoragePassphrase};
+            //     }
+            // };
+
+            cryptoCallbacks = {
+                getSecretStorageKey: async ({ keys }) => {
+                    const backupPassphrase = node.secretStoragePassphrase;
+                    if (!backupPassphrase) {
+                        node.WARN("Missing secret storage key");
+                        return null;
+                    }
+                    let keyId = await node.matrixClient.getDefaultSecretStorageKeyId();
+                    if (keyId && !keys[keyId]) {
+                        keyId = undefined;
+                    }
+                    if (!keyId) {
+                        keyId = keys[0][0];
+                    }
+                    const backupInfo = await node.matrixClient.getKeyBackupVersion();
+                    const key = await node.matrixClient.keyBackupKeyFromPassword(
+                        backupPassphrase,
+                        backupInfo
+                    );
+                    return [keyId, key];
+                },
+            }
+        }
+
         let localStorageDir = storageDir + '/' + MatrixFolderNameFromUserId(this.userId),
             localStorage = new LocalStorage(localStorageDir),
             initialSetup = false;
@@ -51,7 +101,7 @@ module.exports = function(RED) {
         } else if(!this.url) {
             node.error("Matrix connection failed: missing server URL in configuration.");
         } else {
-            node.setConnected = function(connected, cb) {
+            node.setConnected = async function(connected, cb) {
                 if (node.connected !== connected) {
                     node.connected = connected;
                     if(typeof cb === 'function') {
@@ -62,6 +112,16 @@ module.exports = function(RED) {
                         node.log("Matrix server connection ready.");
                         node.emit("connected");
                         if(!initialSetup) {
+                            if(node.enableE2ee && node.secretStoragePassphrase && !await node.matrixClient.isCrossSigningReady() && false) {
+                                // bootstrap cross-signing
+                                await node.matrixClient.bootstrapCrossSigning({
+                                    // maybe we can skip this?
+                                    authUploadDeviceSigningKeys: () => {
+                                        return true;
+                                    }
+                                });
+                            }
+
                             // store Device ID internally
                             let stored_device_id = getStoredDeviceId(localStorage),
                                 device_id = this.matrixClient.getDeviceId();
@@ -119,7 +179,9 @@ module.exports = function(RED) {
                 sessionStore: new sdk.WebStorageSessionStore(localStorage),
                 cryptoStore: new LocalStorageCryptoStore(localStorage),
                 userId: this.userId,
-                deviceId: (this.deviceId || getStoredDeviceId(localStorage)) || undefined
+                deviceId: (this.deviceId || getStoredDeviceId(localStorage)) || undefined,
+                verificationMethods: ["m.sas.v1"],
+                cryptoCallbacks: cryptoCallbacks
             });
 
             // set globally if configured to do so
diff --git a/src/matrix-synapse-join-room.html b/src/matrix-synapse-join-room.html
index 37b2f3e..bfdef39 100644
--- a/src/matrix-synapse-join-room.html
+++ b/src/matrix-synapse-join-room.html
@@ -33,23 +33,22 @@
         <label for="node-input-roomId"><i class="fa fa-comments"></i> Room ID</label>
         <input type="text" id="node-input-roomId" placeholder="msg.topic">
         <pre class="form-tips" id="node-input-roomId-error" style="color: #721c24;background-color: #f8d7da;border-color: #f5c6cb;margin-bottom: 12px;margin-top: 12px;display:none;"></pre>
-        <script type="text/javascript">
-            $(function(){
-                $("#node-input-roomId").on("keyup", function() {
-                    if($(this).val() && !$(this).val().startsWith("!")) {
-                        $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
-                    } else {
-                        $("#node-input-roomId-error").hide();
-                    }
-                }).trigger('keyup');
-            });
-        </script>
-    </div>
     </div>
 
     <div class="form-tips" style="margin-bottom: 12px;">
         User must be an admin to use this endpoint.
     </div>
+    <script type="text/javascript">
+        $(function(){
+            $("#node-input-roomId").on("keyup", function() {
+                if($(this).val() && !$(this).val().startsWith("!")) {
+                    $("#node-input-roomId-error").html(`Room IDs start with exclamation point "!"<br />Example: !OGEhHVWSdvArJzumhm:matrix.org`).show();
+                } else {
+                    $("#node-input-roomId-error").hide();
+                }
+            }).trigger('keyup');
+        });
+    </script>
 </script>
 
 <script type="text/html" data-help-name="matrix-synapse-join-room">