diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp
index c1b9e5ccf3..d6f6eef58c 100644
--- a/interface/src/ui/LoginDialog.cpp
+++ b/interface/src/ui/LoginDialog.cpp
@@ -19,7 +19,6 @@
 #include <plugins/PluginManager.h>
 #include <plugins/SteamClientPlugin.h>
 #include <ui/TabletScriptingInterface.h>
-
 #include <UserActivityLogger.h>
 
 #include "AccountManager.h"
@@ -31,11 +30,13 @@
 
 HIFI_QML_DEF(LoginDialog)
 
-LoginDialog::LoginDialog(QQuickItem* parent) : OffscreenQmlDialog(parent) {
+LoginDialog::LoginDialog(QQuickItem *parent) : OffscreenQmlDialog(parent) {
     auto accountManager = DependencyManager::get<AccountManager>();
 #if !defined(Q_OS_ANDROID)
-    connect(accountManager.data(), &AccountManager::loginComplete, this, &LoginDialog::handleLoginCompleted);
-    connect(accountManager.data(), &AccountManager::loginFailed, this, &LoginDialog::handleLoginFailed);
+    connect(accountManager.data(), &AccountManager::loginComplete,
+        this, &LoginDialog::handleLoginCompleted);
+    connect(accountManager.data(), &AccountManager::loginFailed,
+            this, &LoginDialog::handleLoginFailed);
 #endif
 }
 
@@ -77,7 +78,9 @@ void LoginDialog::toggleAction() {
     if (accountManager->isLoggedIn()) {
         // change the menu item to logout
         loginAction->setText("Logout " + accountManager->getAccountInfo().getUsername());
-        connection = connect(loginAction, &QAction::triggered, accountManager.data(), &AccountManager::logout);
+        connection = connect(loginAction, &QAction::triggered, [] {
+            LoginDialog::showWithSelection();
+        });
     } else {
         // change the menu item to login
         loginAction->setText("Login / Sign Up");
@@ -129,8 +132,9 @@ void LoginDialog::linkSteam() {
             payload.insert("steam_auth_ticket", QJsonValue::fromVariant(QVariant(ticket)));
 
             auto accountManager = DependencyManager::get<AccountManager>();
-            accountManager->sendRequest(LINK_STEAM_PATH, AccountManagerAuth::Required, QNetworkAccessManager::PostOperation,
-                                        callbackParams, QJsonDocument(payload).toJson());
+            accountManager->sendRequest(LINK_STEAM_PATH, AccountManagerAuth::Required,
+                                        QNetworkAccessManager::PostOperation, callbackParams,
+                                        QJsonDocument(payload).toJson());
         });
     }
 }
@@ -159,24 +163,27 @@ void LoginDialog::createAccountFromStream(QString username) {
 
             auto accountManager = DependencyManager::get<AccountManager>();
             accountManager->sendRequest(CREATE_ACCOUNT_FROM_STEAM_PATH, AccountManagerAuth::None,
-                                        QNetworkAccessManager::PostOperation, callbackParams, QJsonDocument(payload).toJson());
+                                        QNetworkAccessManager::PostOperation, callbackParams,
+                                        QJsonDocument(payload).toJson());
         });
     }
 }
 
 void LoginDialog::openUrl(const QString& url) const {
-    auto tablet = dynamic_cast<TabletProxy*>(
-        DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system"));
+    auto tablet = dynamic_cast<TabletProxy*>(DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system"));
     auto hmd = DependencyManager::get<HMDScriptingInterface>();
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
 
     if (tablet->getToolbarMode()) {
-        offscreenUi->load("Browser.qml", [=](QQmlContext* context, QObject* newObject) { newObject->setProperty("url", url); });
+        offscreenUi->load("Browser.qml", [=](QQmlContext* context, QObject* newObject) {
+            newObject->setProperty("url", url);
+        });
         LoginDialog::hide();
     } else {
         if (!hmd->getShouldShowTablet() && !qApp->isHMDMode()) {
-            offscreenUi->load("Browser.qml",
-                              [=](QQmlContext* context, QObject* newObject) { newObject->setProperty("url", url); });
+            offscreenUi->load("Browser.qml", [=](QQmlContext* context, QObject* newObject) {
+                newObject->setProperty("url", url);
+            });
             LoginDialog::hide();
         } else {
             tablet->gotoWebScreen(url);
@@ -220,7 +227,8 @@ void LoginDialog::signup(const QString& email, const QString& username, const QS
     qDebug() << "Sending a request to create an account for" << username;
 
     auto accountManager = DependencyManager::get<AccountManager>();
-    accountManager->sendRequest(API_SIGNUP_PATH, AccountManagerAuth::None, QNetworkAccessManager::PostOperation, callbackParams,
+    accountManager->sendRequest(API_SIGNUP_PATH, AccountManagerAuth::None,
+                                QNetworkAccessManager::PostOperation, callbackParams,
                                 QJsonDocument(payload).toJson());
 }
 
@@ -269,8 +277,7 @@ void LoginDialog::signupFailed(QNetworkReply* reply) {
 
         emit handleSignupFailed(errorStringList.join('\n'));
     } else {
-        static const QString DEFAULT_SIGN_UP_FAILURE_MESSAGE =
-            "There was an unknown error while creating your account. Please try again later.";
+        static const QString DEFAULT_SIGN_UP_FAILURE_MESSAGE = "There was an unknown error while creating your account. Please try again later.";
         emit handleSignupFailed(DEFAULT_SIGN_UP_FAILURE_MESSAGE);
     }
 }
diff --git a/interface/src/ui/LoginDialog.h b/interface/src/ui/LoginDialog.h
index 717e089f3e..b3f3d8a1a4 100644
--- a/interface/src/ui/LoginDialog.h
+++ b/interface/src/ui/LoginDialog.h
@@ -65,9 +65,6 @@ protected slots:
     Q_INVOKABLE void signup(const QString& email, const QString& username, const QString& password);
 
     Q_INVOKABLE void openUrl(const QString& url) const;
-
-private:
-    bool _poppedUp {false};
 };
 
 #endif // hifi_LoginDialog_h