diff --git a/templates/base.html b/templates/base.html
index fc69dbe..848df44 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -212,6 +212,7 @@
         <span class="navbar-toggler-icon"></span>
       </button>
       <div class="collapse navbar-collapse" id="navbarNavDropdown">
+        {% if session.get('user_id') %}
         <ul class="navbar-nav me-auto">
           <!-- Dashboard -->
           <li class="nav-item">
@@ -250,6 +251,7 @@
             </ul>
           </li>
         </ul>
+        {% endif %}
         <ul class="navbar-nav ms-auto align-items-center">
           <!-- Przełącznik trybu ciemnego -->
           <li class="nav-item me-2">
@@ -260,14 +262,23 @@
               </div>
             </form>
           </li>
-          <!-- Zmień hasło -->
+          {% if session.get('user_id') %}
+          <!-- Opcje dla zalogowanego użytkownika -->
           <li class="nav-item">
             <a class="nav-link btn btn-alert ms-2 btn-logout" href="{{ url_for('change_password') }}">Zmień hasło</a>
           </li>
-          <!-- Wyloguj -->
           <li class="nav-item">
             <a class="nav-link btn btn-danger ms-2 btn-logout" href="{{ url_for('logout') }}">Wyloguj</a>
           </li>
+          {% else %}
+          <!-- Opcje logowania i rejestracji dla niezalogowanych -->
+          <li class="nav-item">
+            <a class="nav-link btn btn-success ms-2" href="{{ url_for('login') }}">Zaloguj się</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link btn btn-primary ms-2" href="{{ url_for('register') }}">Zarejestruj się</a>
+          </li>
+          {% endif %}
         </ul>
       </div>
     </div>
diff --git a/templates/login.html b/templates/login.html
index f8c7ae6..ac23667 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -1,7 +1,18 @@
 {% extends "base.html" %}
+{% block head %}
+<style>
+  @media (max-width: 576px) {
+    .full-height-row {
+      min-height: auto !important;
+      padding-top: 1rem;
+      padding-bottom: 1rem;
+    }
+  }
+</style>
+{% endblock %}
 {% block content %}
 <div class="container">
-  <div class="row justify-content-center align-items-center" style="min-height: 100vh;">
+  <div class="row full-height-row justify-content-center align-items-center" style="min-height: 100vh;">
     <div class="col-md-6">
       <div class="card shadow">
         <div class="card-header text-center">
diff --git a/templates/register.html b/templates/register.html
index ecee7e9..c19a01a 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -1,7 +1,18 @@
 {% extends "base.html" %}
+{% block head %}
+<style>
+  @media (max-width: 576px) {
+    .full-height-row {
+      min-height: auto !important;
+      padding-top: 1rem;
+      padding-bottom: 1rem;
+    }
+  }
+</style>
+{% endblock %}
 {% block content %}
 <div class="container">
-  <div class="row justify-content-center align-items-center" style="min-height: 100vh;">
+  <div class="row full-height-row justify-content-center align-items-center" style="min-height: 100vh;">
     <div class="col-md-6">
       <div class="card shadow">
         <div class="card-header text-center">