diff --git a/packages/desktop-client/src/components/LoggedInUser.js b/packages/desktop-client/src/components/LoggedInUser.js
index 63306f797e8f0ed86fcd873c3b8a8e57c2908968..b6f8a4298ffbb3801632e0fa3075ce11cb46839a 100644
--- a/packages/desktop-client/src/components/LoggedInUser.js
+++ b/packages/desktop-client/src/components/LoggedInUser.js
@@ -54,11 +54,14 @@ function LoggedInUser({
   }
 
   async function onClick() {
-    if (serverUrl) {
+    if (!serverUrl) {
+      await closeBudget();
+      window.__history.push('/config-server');
+    } else if (userData) {
       setMenuOpen(true);
     } else {
       await closeBudget();
-      window.__history.push('/config-server');
+      window.__history.push('/login');
     }
   }
 
@@ -97,7 +100,11 @@ function LoggedInUser({
       </View>
     );
   } else {
-    return <View style={[{ color }, style]}>Not logged in</View>;
+    return (
+      <Button bare onClick={onClick} style={[{ color }, style]}>
+        Not logged in
+      </Button>
+    );
   }
 }