diff --git a/src/mainview/components/AccountComboBoxPopup.qml b/src/mainview/components/AccountComboBoxPopup.qml
index 813cb8e..f10b4f5 100644
--- a/src/mainview/components/AccountComboBoxPopup.qml
+++ b/src/mainview/components/AccountComboBoxPopup.qml
@@ -89,12 +89,7 @@
                     anchors.bottom: userImage.bottom
                     anchors.bottomMargin: -2
 
-                    // Visible when account is registered.
-                    visible: {
-                        return accountListModel.data(
-                                    accountListModel.index(index, 0), 261)
-                                === Account.Status.REGISTERED
-                    }
+                    accountStatus: Status
                 }
             }