diff --git a/src/project/templates/account/login.html b/src/project/templates/account/login.html
index 2605b5f..d17b786 100644
--- a/src/project/templates/account/login.html
+++ b/src/project/templates/account/login.html
@@ -3,8 +3,6 @@
 {% load static %}
 
 {% block non_login_content %}
-    <img class="mb-4" src="https://new.data.coop/static/img/logo_da.svg" alt=""
-         width="260" height="160">
 
     {% if form.non_field_errors %}
         {% for error in form.non_field_errors %}
@@ -24,7 +22,7 @@
         <input type="text"
                id="id_username"
                name="login"
-               class="form-control"
+               class="form-control mb-lg-2"
                placeholder="{% trans "Username/e-mail" %}"
                required
                autofocus>
@@ -35,13 +33,17 @@
         <input type="password"
                id="id_password"
                name="password"
-               class="form-control"
+               class="form-control mb-lg-2"
                placeholder="{% trans "Password" %}"
                required>
 
-        <button class="w-100 btn btn-lg btn-primary"
+        <button class="w-100 mb-lg-2 btn btn-lg btn-primary"
                 type="submit">{% trans "Sign in" %}</button>
     </form>
+    <a href="{% url "account_reset_password" %}"
+       class="w-100 btn btn-lg btn-outline-info">
+        {% trans "Forgot password?" %}
+    </a>
 
     <hr class="hr-text" data-content="{% trans "Or"|upper %}">
 
@@ -50,4 +52,5 @@
        href="{% url "account_signup" %}">
         {% trans "Become a member" %}
     </a>
+
 {% endblock %}
diff --git a/src/project/templates/account/password_reset.html b/src/project/templates/account/password_reset.html
index de23d9e..ce8be80 100644
--- a/src/project/templates/account/password_reset.html
+++ b/src/project/templates/account/password_reset.html
@@ -1,13 +1,14 @@
-{% extends "account/base.html" %}
+{% extends "account/pre_login_base.html" %}
 
 {% load i18n %}
 {% load account %}
 
 {% block head_title %}{% trans "Password Reset" %}{% endblock %}
 
-{% block content %}
+{% block non_login_content %}
+
+    <h1 class="h3 mb-3 fw-normal">{% trans "Password Reset" %}</h1>
 
-    <h1>{% trans "Password Reset" %}</h1>
     {% if user.is_authenticated %}
     {% include "account/snippets/already_logged_in.html" %}
     {% endif %}
@@ -16,9 +17,33 @@
 
     <form method="POST" action="{% url 'account_reset_password' %}" class="password_reset">
         {% csrf_token %}
-        {{ form.as_p }}
-        <input type="submit" value="{% trans 'Reset My Password' %}" />
+        <label for="id_email" class="visually-hidden">
+            {% trans "E-mail address" %}
+        </label>
+        <input type="email"
+               id="id_email"
+               name="email"
+               class="form-control mb-lg-2 {% if form.email.errors %}is-invalid{% elif form.is_bound %}is-valid{% endif %}"
+               placeholder="{% trans "E-mail address" %}"
+               required>
+        {% if form.email.errors %}
+            {% for error in form.email.errors %}
+                <div class="invalid-feedback mb-lg-2">
+                    {{ error }}
+                </div>
+            {% endfor %}
+        {% endif %}
+
+        <input class="w-100 btn btn-lg btn-primary"
+               type="submit" value="{% trans 'Reset My Password' %}" />
     </form>
 
     <p>{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}</p>
+
+    <hr>
+    <a class="w-100"
+       type="submit"
+       href="{% url "account_login" %}">
+        {% trans "To login" %}
+    </a>
 {% endblock %}
diff --git a/src/project/templates/account/pre_login_base.html b/src/project/templates/account/pre_login_base.html
index 8e5f0e9..37e6626 100644
--- a/src/project/templates/account/pre_login_base.html
+++ b/src/project/templates/account/pre_login_base.html
@@ -49,18 +49,6 @@
             z-index: 2;
         }
 
-        .form-signin input[type="email"] {
-            margin-bottom: -1px;
-            border-bottom-right-radius: 0;
-            border-bottom-left-radius: 0;
-        }
-
-        .form-signin input[type="password"] {
-            margin-bottom: 10px;
-            border-top-left-radius: 0;
-            border-top-right-radius: 0;
-        }
-
         .hr-text:after {
             content: attr(data-content);
             padding: 0 4px;
@@ -75,6 +63,9 @@
 <body class="text-center">
 
 <main class="form-signin">
+    <img class="mb-4" src="https://new.data.coop/static/img/logo_da.svg" alt=""
+         width="260" height="160">
+
     {% block non_login_content %}
     {% endblock %}
 </main>
diff --git a/src/project/templates/account/signup.html b/src/project/templates/account/signup.html
index 1dfff44..27eb870 100644
--- a/src/project/templates/account/signup.html
+++ b/src/project/templates/account/signup.html
@@ -3,8 +3,6 @@
 {% load static %}
 
 {% block non_login_content %}
-    <img class="mb-4" src="https://new.data.coop/static/img/logo_da.svg" alt=""
-         width="260" height="160">
     <h1 class="h3 mb-3 fw-normal">{% trans "Become a member" %}</h1>
 
     {% if form.non_field_errors %}
@@ -18,6 +16,8 @@
     {{ form.email.errors }}
     {{ form.password1.errors }}
 
+    <p>{% trans "To become a member, you need to have an account. Create one here." %}</p>
+
     <form method="post" action="">
         {% csrf_token %}
 
@@ -28,7 +28,7 @@
         <input type="email"
                id="id_email"
                name="email"
-               class="form-control {% if form.password1.errors %}is-invalid{% elif form.is_bound %}is-valid{% endif %}"
+               class="form-control mb-lg-2 {% if form.email.errors %}is-invalid{% elif form.is_bound %}is-valid{% endif %}"
                placeholder="{% trans "E-mail" %}"
                required
                autofocus>
@@ -46,7 +46,7 @@
         <input type="password"
                id="id_password"
                name="password1"
-               class="form-control {% if form.password1.errors %}is-invalid{% elif form.is_bound %}is-valid{% endif %}"
+               class="form-control mb-lg-2 {% if form.password1.errors %}is-invalid{% elif form.is_bound %}is-valid{% endif %}"
                placeholder="{% trans "Password" %}"
                required>
         {% if form.password1.errors %}