diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index f791d20588..c2b6c293b9 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -103,6 +103,7 @@ Menu::Menu() :
     _fastFPSAverage(ONE_SECOND_OF_FRAMES),
     _loginAction(NULL),
     _preferencesDialog(NULL),
+    _loginDialog(NULL),
     _snapshotsLocation()
 {
     Application *appInstance = Application::getInstance();
@@ -913,9 +914,11 @@ void sendFakeEnterEvent() {
 const float DIALOG_RATIO_OF_WINDOW = 0.30f;
 
 void Menu::loginForCurrentDomain() {
-    LoginDialog* loginDialog = new LoginDialog(Application::getInstance()->getWindow());
-    loginDialog->show();
-    loginDialog->resizeAndPosition(false);
+    if (!_loginDialog) {
+        _loginDialog = new LoginDialog(Application::getInstance()->getWindow());
+        _loginDialog->show();
+        _loginDialog->resizeAndPosition(false);
+    }
 }
 
 void Menu::editPreferences() {
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 69015a938b..a0fafc0514 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -27,6 +27,7 @@
 #include "ui/PreferencesDialog.h"
 #include "ui/ChatWindow.h"
 #include "ui/JSConsole.h"
+#include "ui/LoginDialog.h"
 #include "ui/ScriptEditorWindow.h"
 
 const float ADJUST_LOD_DOWN_FPS = 40.0;
@@ -270,6 +271,7 @@ private:
     QPointer<PreferencesDialog> _preferencesDialog;
     QPointer<AttachmentsDialog> _attachmentsDialog;
     QPointer<AnimationsDialog> _animationsDialog;
+    QPointer<LoginDialog> _loginDialog;
     QAction* _chatAction;
     QString _snapshotsLocation;
 };
diff --git a/interface/src/ui/OAuthWebViewHandler.cpp b/interface/src/ui/OAuthWebViewHandler.cpp
index 5415d5d9c3..5b4431bd0f 100644
--- a/interface/src/ui/OAuthWebViewHandler.cpp
+++ b/interface/src/ui/OAuthWebViewHandler.cpp
@@ -103,8 +103,9 @@ void OAuthWebViewHandler::displayWebviewForAuthorizationURL(const QUrl& authoriz
             codedAuthorizationURL.setQuery(authQuery);
         }
         
+        connect(_activeWebView.data(), &QWebView::urlChanged, this, &OAuthWebViewHandler::handleURLChanged);
+        
         _activeWebView->load(codedAuthorizationURL);
-        _activeWebView->show();
         
         connect(_activeWebView->page()->networkAccessManager(), &QNetworkAccessManager::sslErrors,
                 this, &OAuthWebViewHandler::handleSSLErrors);
@@ -137,3 +138,17 @@ void OAuthWebViewHandler::handleLoadFinished(bool success) {
 void OAuthWebViewHandler::handleWebViewDestroyed(QObject* destroyedObject) {
     _webViewRedisplayTimer.restart();
 }
+
+void OAuthWebViewHandler::handleURLChanged(const QUrl& url) {
+    // check if this is the authorization screen - if it is then we need to show the OAuthWebViewHandler
+    const QString ACCESS_TOKEN_URL_REGEX_STRING = "redirect_uri=[\\w:\\/\\.]+&access_token=";
+    QRegExp accessTokenRegex(ACCESS_TOKEN_URL_REGEX_STRING);
+    
+    if (accessTokenRegex.indexIn(url.toString()) != -1) {
+        _activeWebView->show();
+    } else if (url.toString() == DEFAULT_NODE_AUTH_URL.toString() + "/login") {
+        // this is a login request - we're going to close the webview and signal the AccountManager that we need a login
+        _activeWebView->close();
+        AccountManager::getInstance().checkAndSignalForAccessToken();        
+    }
+}
diff --git a/interface/src/ui/OAuthWebViewHandler.h b/interface/src/ui/OAuthWebViewHandler.h
index 3a30705f88..8f0c01c90d 100644
--- a/interface/src/ui/OAuthWebViewHandler.h
+++ b/interface/src/ui/OAuthWebViewHandler.h
@@ -32,6 +32,7 @@ private slots:
     void handleSSLErrors(QNetworkReply* networkReply, const QList<QSslError>& errorList);
     void handleLoadFinished(bool success);
     void handleWebViewDestroyed(QObject* destroyedObject);
+    void handleURLChanged(const QUrl& url);
 private:
     QPointer<QWebView> _activeWebView;
     QElapsedTimer _webViewRedisplayTimer;