diff --git a/src/servala/frontend/templates/includes/sidebar.html b/src/servala/frontend/templates/includes/sidebar.html
index 617ff56..e3c62f4 100644
--- a/src/servala/frontend/templates/includes/sidebar.html
+++ b/src/servala/frontend/templates/includes/sidebar.html
@@ -56,8 +56,16 @@
             </div>
             <div class="sidebar-menu">
                 <ul class="menu">
-                    {% if request.user.is_authenticated %}
-                        <li class="sidebar-item active">
+                    {% if not request.user.is_authenticated %}
+                        <li class="sidebar-item">
+                            <a href="{% url 'account_login' %}" class="sidebar-link">
+                                <i class="bi bi-person-badge-fill"></i>
+                                <span>{% translate 'Login' %}</span>
+                            </a>
+                        </li>
+                    {% else %}
+                        {# request.user.is_authenticated #}
+                        <li class="sidebar-item">
                             {% if user_organizations.count > 1 %}
                                 <button class="btn btn-primary dropdown-toggle me-1"
                                         type="button"
@@ -85,30 +93,13 @@
                                 </a>
                             {% endif %}
                         </li>
-                    {% endif %}
-                    <li class="sidebar-item active">
-                        <a href="index.html" class='sidebar-link'>
-                            <i class="bi bi-grid-fill"></i>
-                            <span>{% translate 'Dashboard' %}</span>
-                        </a>
-                    </li>
-                    <li class="sidebar-title">{% translate 'Account' %}</li>
-                    {% if not request.user.is_authenticated %}
-                        <li class="sidebar-item has-sub">
-                            <a href="#" class='sidebar-link'>
-                                <i class="bi bi-person-badge-fill"></i>
-                                <span>{% translate 'Authentication' %}</span>
+                        <li class="sidebar-item">
+                            <a href="index.html" class='sidebar-link'>
+                                <i class="bi bi-grid-fill"></i>
+                                <span>{% translate 'Dashboard' %}</span>
                             </a>
-                            <ul class="submenu">
-                                <li class="submenu-item">
-                                    <a href="{% url 'account_login' %}" class="submenu-link">{% translate 'Login' %}</a>
-                                </li>
-                                <li class="submenu-item">
-                                    <a href="{% url 'account_signup' %}" class="submenu-link">{% translate 'Register' %}</a>
-                                </li>
-                            </ul>
                         </li>
-                    {% else %}
+                        <li class="sidebar-title">{% translate 'Account' %}</li>
                         <li class="sidebar-item">
                             <a href="{% url 'frontend:profile' %}" class='sidebar-link'>
                                 <i class="bi bi-file-person"></i>
@@ -125,6 +116,7 @@
                             </form>
                         </li>
                     {% endif %}
+                    {# request.user.is_authenticated #}
                 </ul>
             </div>
         </div>