diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
index 793bc029c..873fde07c 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
@@ -157,10 +157,11 @@ public class ChooseAccountDialogFragment extends DialogFragment {
         binding.setStatus.setOnClickListener(v -> {
             dismiss();
 
-            // TODO: better solution
             if(status != null) {
                 SetStatusDialogFragment setStatusDialog = SetStatusDialogFragment.newInstance(user, status);
                 setStatusDialog.show(getActivity().getSupportFragmentManager(), "fragment_set_status");
+            } else {
+                Log.w(TAG, "status was null");
             }
         });
 
@@ -212,6 +213,7 @@ public class ChooseAccountDialogFragment extends DialogFragment {
                 @Override
                 public void onNext(@NonNull StatusOverall statusOverall) {
                     status = statusOverall.ocs.data;
+                    binding.setStatus.setEnabled(true);
                 }
 
                 @Override
diff --git a/app/src/main/res/layout/dialog_choose_account.xml b/app/src/main/res/layout/dialog_choose_account.xml
index 702a7392a..2b3337110 100644
--- a/app/src/main/res/layout/dialog_choose_account.xml
+++ b/app/src/main/res/layout/dialog_choose_account.xml
@@ -62,6 +62,7 @@
             android:textAlignment="textStart"
             android:textAllCaps="false"
             android:textColor="@color/fontAppbar"
+            android:enabled="false"
             app:icon="@drawable/ic_edit"
             app:iconGravity="start"
             app:iconPadding="22dp"