diff --git a/shopping_app/routes_main.py b/shopping_app/routes_main.py
index 859ed83..3218de1 100644
--- a/shopping_app/routes_main.py
+++ b/shopping_app/routes_main.py
@@ -207,11 +207,9 @@ def main_page():
 
 @app.route("/system-auth", methods=["GET", "POST"])
 def system_auth():
-    if (
-        current_user.is_authenticated
-        or request.cookies.get("authorized") == AUTHORIZED_COOKIE_VALUE
-    ):
-        flash("Jesteś już zalogowany lub autoryzowany.", "info")
+    
+    if request.cookies.get("authorized") == AUTHORIZED_COOKIE_VALUE:
+        flash("Jesteś już autoryzowany.", "info")
         return redirect(url_for("main_page"))
 
     ip = request.access_route[0]
diff --git a/shopping_app/templates/base.html b/shopping_app/templates/base.html
index 9585856..1d40de3 100644
--- a/shopping_app/templates/base.html
+++ b/shopping_app/templates/base.html
@@ -12,6 +12,8 @@
   <link href="{{ static_asset_url('static_bp.serve_css_lib', 'bootstrap.min.css') }}" rel="stylesheet">
   <link href="{{ static_asset_url('static_bp.serve_css', 'style.css') }}" rel="stylesheet">
 
+  {% set hide_login_ui = request.path == '/system-auth' %}
+
   {% set exclude_paths = ['/system-auth'] %}
   {% if (exclude_paths | select("in", request.path) | list | length == 0)
   and has_authorized_cookie
@@ -82,7 +84,7 @@
             <span class="navbar-toggler-icon"></span>
           </button>
           <div class="dropdown-menu dropdown-menu-end app-mobile-menu__panel">
-            {% if not is_blocked and request.endpoint and request.endpoint != 'system_auth' %}
+            {% if not is_blocked and not hide_login_ui %}
               {% if current_user.is_authenticated %}
                 {% if current_user.is_admin %}
                 <a href="{{ url_for('admin_panel') }}" class="dropdown-item app-mobile-menu__item">⚙️ <span>Panel</span></a>
@@ -99,7 +101,7 @@
 
         <div class="d-none d-lg-flex justify-content-end order-lg-3" id="appNavbarMenu">
           <div class="app-navbar__actions">
-            {% if not is_blocked and request.endpoint and request.endpoint != 'system_auth' %}
+            {% if not is_blocked and not hide_login_ui %}
               {% if current_user.is_authenticated %}
                 {% if current_user.is_admin %}
                 <a href="{{ url_for('admin_panel') }}" class="btn btn-outline-light btn-sm app-nav-action">⚙️ <span>Panel</span></a>
@@ -194,4 +196,4 @@
 
   {% block scripts %}{% endblock %}
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/shopping_app/web.py b/shopping_app/web.py
index 11a06c4..0b117bc 100644
--- a/shopping_app/web.py
+++ b/shopping_app/web.py
@@ -71,7 +71,7 @@ def require_system_password():
     if is_ip_blocked(ip):
         abort(403)
 
-    if "authorized" not in request.cookies and not endpoint.startswith("login"):
+    if "authorized" not in request.cookies:
         if request.path == "/":
             return redirect(url_for("system_auth"))