diff --git a/templates/zerver/login.html b/templates/zerver/login.html
index c837f75e75..4667fc52e4 100644
--- a/templates/zerver/login.html
+++ b/templates/zerver/login.html
@@ -110,6 +110,13 @@ page can be easily identified in it's respective JavaScript file. -->
                                 <label for="id_password">{{ _('Password') }}</label>
                                 <i class="fa fa-eye-slash password_visibility_toggle" role="button" tabindex="0"></i>
                             </div>
+
+                            <div class="actions forgot-password-container">
+                                {% if email_auth_enabled %}
+                                <a class="forgot-password" href="/accounts/password/reset/">{{ _('Forgot your password?') }}</a>
+                                {% endif %}
+                            </div>
+
                             {% else %}
                             {% include "two_factor/_wizard_forms.html" %}
                             {% endif %}
@@ -145,10 +152,8 @@ page can be easily identified in it's respective JavaScript file. -->
                     </div>
                     {% endfor %}
 
-                    <div class="actions">
-                        {% if email_auth_enabled %}
-                        <a class="forgot-password" href="/accounts/password/reset/">{{ _('Forgot your password?') }}</a>
-                        {% endif %}
+                    <div class="actions signup-link-wrapper">
+                        {{ _("Don't have an account?")}}
                         {% if not register_link_disabled %}
                         <a class="register-link float-right" href="/register/">{{ _('Sign up') }}</a>
                         {% endif %}
diff --git a/web/styles/portico/portico_signin.css b/web/styles/portico/portico_signin.css
index fa196e28e8..5327576d73 100644
--- a/web/styles/portico/portico_signin.css
+++ b/web/styles/portico/portico_signin.css
@@ -862,6 +862,20 @@ button#register_auth_button_gitlab {
 .back-to-login-wrapper {
     margin: 20px 0 0;
     text-align: left;
+
+    &.forgot-password-container {
+        margin: 0;
+    }
+
+    &.signup-link-wrapper {
+        font-weight: normal;
+        float: right;
+
+        .register-link {
+            font-size: 1rem;
+            margin-left: 5px;
+        }
+    }
 }
 
 .register-page-container .register-form-login-redirect {