diff --git a/euth/users/templates/euth_users/indicator_menu.html b/euth/users/templates/euth_users/indicator_menu.html
index 167388ad1..205922c86 100644
--- a/euth/users/templates/euth_users/indicator_menu.html
+++ b/euth/users/templates/euth_users/indicator_menu.html
@@ -1,8 +1,8 @@
 {% load i18n thumbnail avatar %}
 
 <ul class="nav navbar-nav navbar-right ms-sm-auto user-indicator order-sm-2" id="user-indicator">
-    <li class="dropdown">
     {% if request.user.is_authenticated %}
+    <li class="dropdown">
         <div class="btngroup btngroup-primary ms-sm-3">
             <a href="{% url 'profile' request.user.username %}" class="btn userindicator-profile">
                 <span class="circled circled-xs" style="background-image: url({% get_avatar request.user 'org_avatar_small' %});"></span>
@@ -43,17 +43,8 @@
             </ul>
         </div>
     {% else %}
-        <a href="#" class="dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="inner">{% trans "Login"%}<i class="fa fa-caret-down ps-1" aria-hidden="true"></i></span>
-        </a>
-        <ul class="dropdown-menu">
-            <li>
-                <a href="{% url 'account_login' %}?next={{ redirect_field_value|urlencode }}" class="dropdown-item">{% trans "login" %}</a>
-            </li>
-<!--           <li>
-                <a href="{% url 'account_signup' %}?next={{ redirect_field_value|urlencode }}" class="dropdown-item">{% trans "register" %}</a>
-            </li>
--->
-        </ul>
-    {% endif %}
+    <li class="nav-item">
+        <a href="{% url 'account_login' %}?next={{ redirect_field_value|urlencode }}" class="nav-link px-3">{% trans "login" %}</a>
     </li>
+    {% endif %}
 </ul>
diff --git a/euth_wagtail/templates/account/login.html b/euth_wagtail/templates/account/login.html
index 3c9f78e84..69c19da87 100644
--- a/euth_wagtail/templates/account/login.html
+++ b/euth_wagtail/templates/account/login.html
@@ -8,8 +8,8 @@
 {% block title %}{% trans 'Login' %}{% endblock %}
 
 {% block content %}
-<div class="account__container">
-    <div class="account__container--left">
+<div class="container">
+    <div class="container-narrow">
         {% if not request.user.is_authenticated %}
             <div class="general-form">
                 <div class="form-inner pt-3 pt-md-5">
diff --git a/euth_wagtail/templates/account/signup_closed.html b/euth_wagtail/templates/account/signup_closed.html
index f61f392e2..4107684d4 100644
--- a/euth_wagtail/templates/account/signup_closed.html
+++ b/euth_wagtail/templates/account/signup_closed.html
@@ -5,8 +5,8 @@
 {% block head_title %}{% trans "Sign Up Closed" %}{% endblock %}
 
 {% block content %}
-<div class="account__container">
-    <div class="account__container--left">
+<div class="container">
+    <div class="container-narrow">
         <div class="general-form">
             <header class="form-inner pt-3 pt-md-5">
 		<h1>{% trans "Sign Up Closed" %}</h1>