diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationView.kt
index 9d6830c08..965ece66d 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationView.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationView.kt
@@ -106,7 +106,7 @@ class GroupConversationView : BaseView() {
 
     override fun onFloatingActionButtonClick() {
         view?.conversationNameInputEditText?.text?.let { conversationName ->
-            val conversationType = if (view?.allowGuestsSwitchMaterial?.isChecked == true) 2 else 3
+            val conversationType = if (view?.allowGuestsSwitchMaterial?.isChecked == true) 3 else 2
             viewModel.createConversation(conversationType, conversationName.toString(), view?.passwordInputEditText?.text?.toString())
         }
     }
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationViewModel.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationViewModel.kt
index 82d6241ac..3f9c8db7f 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationViewModel.kt
@@ -54,7 +54,7 @@ class GroupConversationViewModel constructor(
         createConversationUseCase.invoke(viewModelScope, parametersOf(globalService.currentUserLiveData.value, conversationType, null, null, conversationName), object : UseCaseResponse<ConversationOverall> {
             override suspend fun onSuccess(result: ConversationOverall) {
                 result.ocs.data.token?.let { token ->
-                    if (conversationPassword != null) {
+                    if (!conversationPassword.isNullOrEmpty()) {
                         setPasswordForConversation(token, conversationPassword)
                     } else {
                         _operationState.postValue(ContactsViewOperationStateWrapper(ContactsViewOperationState.OK, null, token))
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 37d9a8c76..1ddd96bde 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -56,7 +56,8 @@
                 android:layout_height="32dp"
                 android:layout_gravity="center_vertical|end"
                 android:layout_marginEnd="8dp"
-                android:indeterminateTint="@color/hwSecurityRed"
+                android:visibility="gone"
+                android:indeterminateTint="@color/white"
                 android:scaleType="fitCenter" />
 
         </com.google.android.material.appbar.MaterialToolbar>
diff --git a/app/src/main/res/layout/new_group_conversation_view.xml b/app/src/main/res/layout/new_group_conversation_view.xml
index d42037362..de21079db 100644
--- a/app/src/main/res/layout/new_group_conversation_view.xml
+++ b/app/src/main/res/layout/new_group_conversation_view.xml
@@ -23,6 +23,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:animateLayoutChanges="true">
 
     <RelativeLayout
@@ -33,6 +34,7 @@
             android:id="@+id/conversationNameTextInputLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:endIconMode="clear_text"
             android:hint="@string/nc_call_name">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -45,6 +47,7 @@
         <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/allowGuestsSwitchMaterial"
             android:layout_width="match_parent"
+            app:useMaterialThemeColors="true"
             android:layout_height="wrap_content"
             android:layout_below="@id/conversationNameTextInputLayout"
             android:layout_marginHorizontal="8dp"
@@ -57,6 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/allowGuestsSwitchMaterial"
             android:visibility="gone"
+            app:endIconMode="password_toggle"
             android:hint="@string/nc_password_optional">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -64,6 +68,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginHorizontal="8dp"
+                android:inputType="textPassword"
                 android:layout_marginBottom="8dp" />
         </com.google.android.material.textfield.TextInputLayout>
     </RelativeLayout>