diff --git a/web/src/js/modules/auth.js b/web/src/js/modules/auth.js
index 9557a78a..c921b0c7 100644
--- a/web/src/js/modules/auth.js
+++ b/web/src/js/modules/auth.js
@@ -13,11 +13,6 @@ $(document).ready(function () {
         goPass = auth.find('.js-auth-go-pass'),
         goEnter = auth.find('.js-auth-go-enter');
 
-    $('.js-header-enter').on('click', function () {
-        pass.hide();
-        login.show();
-    });
-
     type.on('click', function (e) {
         e.preventDefault();
         let _this = $(this),
diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js
index c774c6ef..39e63c04 100644
--- a/web/src/js/modules/popup.js
+++ b/web/src/js/modules/popup.js
@@ -277,7 +277,16 @@ $(document).ready(function () {
             });
         }
 
-        showPopup();
+        const showDef = showPopup();
+
+        if( data === '.js-popup-auth') {
+            showDef.then(() => {
+                const login = auth.find('.js-auth-login');
+                const pass = auth.find('.js-auth-pass');
+                pass.css('display', 'none');
+                login.css('display', 'block');
+            });
+        }
     });
 
     $('.js-popup-close').on('click', function(e){