diff --git a/public/locales/de/app.json b/public/locales/de/app.json
index 01115be0..c52d27b8 100644
--- a/public/locales/de/app.json
+++ b/public/locales/de/app.json
@@ -119,5 +119,7 @@
   "Back to recents": "Zurück zu kürzlichen Anrufen",
   "Select app": "App auswählen",
   "Mute microphone": "Mikrofon deaktivieren",
-  "Start new call": "Neuen Anruf beginnen"
+  "Start new call": "Neuen Anruf beginnen",
+  "Call not found": "Anruf nicht gefunden",
+  "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Anrufe sind nun Ende-zu-Ende-verschlüsselt und müssen auf der Startseite erstellt werden. Damit stellen wir sicher, dass alle denselben Schlüssel verwenden."
 }
diff --git a/public/locales/it/app.json b/public/locales/it/app.json
index 41e80f4e..38188f72 100644
--- a/public/locales/it/app.json
+++ b/public/locales/it/app.json
@@ -119,5 +119,7 @@
   "Stop video": "Ferma video",
   "Unmute microphone": "Riaccendi il microfono",
   "Back to recents": "Torna ai recenti",
-  "Start new call": "Inizia nuova chiamata"
+  "Start new call": "Inizia nuova chiamata",
+  "Call not found": "Chiamata non trovata",
+  "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Le chiamate ora sono cifrate end-to-end e devono essere create dalla pagina principale. Ciò assicura che chiunque usi la stessa chiave di crittografia."
 }
diff --git a/src/e2ee/sharedKeyManagement.ts b/src/e2ee/sharedKeyManagement.ts
index 2af0b463..e22d3269 100644
--- a/src/e2ee/sharedKeyManagement.ts
+++ b/src/e2ee/sharedKeyManagement.ts
@@ -59,7 +59,7 @@ export const useManageRoomSharedKey = (roomId: string): string | null => {
     if (password !== e2eeSharedKey) return;
 
     const [hashStart, passwordStart] = hash.split(PASSWORD_STRING);
-    const hashEnd = passwordStart.split("&")[1];
+    const hashEnd = passwordStart.split("&").slice(1).join("&");
 
     location.replace((hashStart ?? "") + (hashEnd ?? ""));
   }, [password, e2eeSharedKey]);
diff --git a/src/room/AppSelectionModal.tsx b/src/room/AppSelectionModal.tsx
index ab353759..9d8e6a73 100644
--- a/src/room/AppSelectionModal.tsx
+++ b/src/room/AppSelectionModal.tsx
@@ -63,9 +63,7 @@ export const AppSelectionModal: FC<Props> = ({ roomId }) => {
     });
 
     const result = new URL("io.element.call:/");
-    // Everything after the last & stripped away making us loose the last param. Most likely while removing the pwd.
-    // TODO fix the pwd removal function (or wherever this happens) to not delete everything after the last &.
-    result.searchParams.set("url", url.toString() + "&");
+    result.searchParams.set("url", url.toString());
     return result.toString();
   }, [roomId, roomSharedKey]);