diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 23a6f5febb..65650bbdb2 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -95,7 +95,7 @@ Window {
                         hoverEnabled: true
                         onClicked:
                         {
-                            accMenuLoginButton.text = (userModelBackend.isCurrentUserConnected() ? "Logout" : "Login")
+                            accMenuLoginButton.text = (userModelBackend.isCurrentUserConnected() ? "Log out" : "Log in")
                             accountMenu.open()
                         }
 
@@ -119,6 +119,10 @@ Window {
 
                             MenuSeparator { id: accountMenuSeparator }
 
+                            MenuItem {
+                                text: "Add account"
+                                onClicked: userModelBackend.addAccount()
+                            }
                             MenuItem {
                                 id: accMenuLoginButton
                                 onClicked: (userModelBackend.isCurrentUserConnected()
@@ -126,11 +130,7 @@ Window {
                                             : userModelBackend.login() )
                             }
                             MenuItem {
-                                text: "Add Account"
-                                onClicked: userModelBackend.addAccount()
-                            }
-                            MenuItem {
-                                text: "Remove Account"
+                                text: "Remove account"
                                 onClicked: userModelBackend.removeAccount()
                             }