diff --git a/src/gui/src/initgui.js b/src/gui/src/initgui.js
index a6c6d7be0..f118941bb 100644
--- a/src/gui/src/initgui.js
+++ b/src/gui/src/initgui.js
@@ -1077,7 +1077,7 @@ window.initgui = async function (options) {
             });
         }
         if ( !reload_on_success && window.is_auth() ) {
-            document.dispatchEvent(new Event('login', { bubbles: true }));
+            window.__login_completed = true;
         }
     }
 
@@ -1577,6 +1577,11 @@ window.initgui = async function (options) {
 
     });
 
+    if ( window.__login_completed ) {
+        document.dispatchEvent(new Event('login', { bubbles: true }));
+        window.__login_completed = false;
+    }
+
     $('.popover, .context-menu').on('remove', function () {
         $('.window-active .window-app-iframe').css('pointer-events', 'all');
     });