diff --git a/src/script/auth/page/ConversationJoin.tsx b/src/script/auth/page/ConversationJoin.tsx
index a2d1e258c6b9..b8892e3b5525 100644
--- a/src/script/auth/page/ConversationJoin.tsx
+++ b/src/script/auth/page/ConversationJoin.tsx
@@ -17,7 +17,7 @@
  *
  */
 
-import React, {useEffect, useState} from 'react';
+import React, {useEffect, useMemo, useState} from 'react';
 
 import type {RegisterData} from '@wireapp/api-client/lib/auth';
 import {BackendErrorLabel} from '@wireapp/api-client/lib/http';
@@ -74,9 +74,8 @@ const ConversationJoinComponent = ({
   const nameInput = React.useRef<HTMLInputElement>(null);
   const {formatMessage: _} = useIntl();
 
-  const conversationHasPassword = conversationInfo?.has_password;
-  const invalidConversationPassword =
-    conversationError && conversationError.label === BackendErrorLabel.INVALID_CONVERSATION_PASSWORD;
+  const conversationHasPassword = useMemo(() => conversationInfo?.has_password, [conversationInfo]);
+
   const [accentColor] = useState(AccentColor.STRONG_BLUE);
   const [isJoinGuestLinkPasswordModalOpen, setIsJoinGuestLinkPasswordModalOpen] = useState<boolean>(false);
   const [conversationCode, setConversationCode] = useState<string>();
@@ -95,10 +94,6 @@ const ConversationJoinComponent = ({
 
   const isWirePublicInstance = Config.getConfig().BRAND_NAME === 'Wire';
 
-  useEffect(() => {
-    setIsJoinGuestLinkPasswordModalOpen(!!invalidConversationPassword);
-  }, [invalidConversationPassword]);
-
   useEffect(() => {
     const localConversationCode = UrlUtil.getURLParameter(QUERY_KEY.CONVERSATION_CODE);
     const localConversationKey = UrlUtil.getURLParameter(QUERY_KEY.CONVERSATION_KEY);
@@ -129,6 +124,10 @@ const ConversationJoinComponent = ({
   };
 
   const getConversationInfoAndJoin = async (password?: string) => {
+    if (!isJoinGuestLinkPasswordModalOpen && !!conversationHasPassword) {
+      setIsJoinGuestLinkPasswordModalOpen(true);
+      return;
+    }
     try {
       if (!conversationCode || !conversationKey) {
         throw Error('Conversation code or key missing');
@@ -142,6 +141,10 @@ const ConversationJoinComponent = ({
 
       routeToApp(conversationEvent.conversation, conversationEvent.qualified_conversation?.domain ?? '');
     } catch (error) {
+      if (conversationHasPassword && error.label === BackendErrorLabel.INVALID_CONVERSATION_PASSWORD && !password) {
+        setIsJoinGuestLinkPasswordModalOpen(true);
+        return;
+      }
       console.warn('Unable to join conversation', error);
       setShowEntropyForm(false);
     }
@@ -249,7 +252,7 @@ const ConversationJoinComponent = ({
           error={conversationError || generalError}
           isLoading={isFetching}
           conversationName={conversationInfo?.name}
-          onSubmitPassword={submitJoinCodeWithPassword}
+          onSubmitPassword={selfName ? getConversationInfoAndJoin : submitJoinCodeWithPassword}
         />
       )}
       <WirelessContainer
diff --git a/src/script/auth/page/Login.tsx b/src/script/auth/page/Login.tsx
index 0933680b350c..e3b1eeb32552 100644
--- a/src/script/auth/page/Login.tsx
+++ b/src/script/auth/page/Login.tsx
@@ -252,6 +252,11 @@ const LoginComponent = ({
     } catch (error) {
       if (isBackendError(error)) {
         switch (error.label) {
+          case BackendErrorLabel.INVALID_CONVERSATION_PASSWORD: {
+            setConversationSubmitData(formLoginData);
+            setIsLinkPasswordModalOpen(true);
+            break;
+          }
           case BackendErrorLabel.TOO_MANY_CLIENTS: {
             await resetAuthError();
             if (formLoginData?.verificationCode) {