diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
index 9c785a78a..4b8a61154 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -884,7 +884,8 @@ public class ChatController extends BaseController implements MessagesListAdapte
                     chatMessage.setBaseUrl(conversationUser.getBaseUrl());
                     chatMessageList.get(i).setActiveUserId(conversationUser.getUserId());
 
-                    if (conversationUser.getUserId().equals("?") && !TextUtils.isEmpty(myFirstMessage.toString())) {
+                    // if credentials are empty, we're acting as a guest
+                    if (TextUtils.isEmpty(credentials) && !TextUtils.isEmpty(myFirstMessage.toString())) {
                         if (chatMessage.getActorType().equals("guests")) {
                             conversationUser.setUserId(chatMessage.getActorId());
                             setSenderId();
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
index 6a8f4b18c..06b0d665f 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
@@ -644,6 +644,7 @@ public class OperationsMenuController extends BaseController {
 
             bundle.putParcelable(BundleKeys.KEY_USER_ENTITY, conversationUser);
             bundle.putParcelable(BundleKeys.KEY_ACTIVE_CONVERSATION, Parcels.wrap(call));
+            bundle.putString(BundleKeys.KEY_CONVERSATION_PASSWORD, callPassword);
 
             conversationIntent.putExtras(bundle);