diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cecbf7f2b7b41ed8104cfbc70f7ed0c7daf1a4de..1a7340fd9d033b40aa5f52df459b0c4315864e87 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,6 +14,11 @@ Changed
 
 * Added a `Retry` button to the server error page
 
+Fixed
+~~~~~
+
+* The ``reset password`` button on the login site used to overflow the card on smaller devices.
+
 `2.7.4`_ - 2022-02-09
 ---------------------
 
diff --git a/aleksis/core/static/public/style.scss b/aleksis/core/static/public/style.scss
index e448c8aa54e55d4667c8dde9826c37e70fed6db0..3fb108dad7c03c66791fb86ebb51e599764bc747 100644
--- a/aleksis/core/static/public/style.scss
+++ b/aleksis/core/static/public/style.scss
@@ -937,3 +937,14 @@ $person-logo-size: 20vh;
   @extend .application-circle;
   object-fit: cover;
 }
+
+// Login Page
+.login-card-action {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+  row-gap: 0.7rem;
+  & *:last-child {
+    grid-column: -2;
+    text-align: center;
+  }
+}
diff --git a/aleksis/core/templates/socialaccount/snippets/provider_list.html b/aleksis/core/templates/socialaccount/snippets/provider_list.html
index 9d9a9c87712076d8954ebce192ea2ac38383cc48..706e81b877936c946c9498201d8af46e95ffdb2e 100644
--- a/aleksis/core/templates/socialaccount/snippets/provider_list.html
+++ b/aleksis/core/templates/socialaccount/snippets/provider_list.html
@@ -7,7 +7,7 @@
         {% for brand in provider.get_brands %}
             <a title="{{brand.name}}" 
               class="socialaccount_provider {{provider.id}} {{brand.id}}
-              btn-large waves-effect waves-light primary-color" 
+              btn-large waves-effect waves-light primary-color margin-bottom"
               href="{% provider_login_url provider.id openid=brand.openid_url process=process %}">
               {% blocktrans with name=brand.name %}
                 Login with {{ name }}
@@ -16,7 +16,7 @@
         {% endfor %}
       {% endif %}
         <a title="{{provider.name}}" class="socialaccount_provider {{provider.id}}
-        btn hundred-percent waves-effect waves-light primary-color" 
+        btn hundred-percent waves-effect waves-light primary-color margin-bottom"
           href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}">
           {% blocktrans with name=provider.name %}
             Login with {{ name }}
diff --git a/aleksis/core/templates/two_factor/core/login.html b/aleksis/core/templates/two_factor/core/login.html
index 834c4b98b543bd994542b105aec1b99932f7d186..819b209979796b358538d22dcf89cf07abec0cbf 100644
--- a/aleksis/core/templates/two_factor/core/login.html
+++ b/aleksis/core/templates/two_factor/core/login.html
@@ -90,13 +90,13 @@
 
             {% include "two_factor/_wizard_forms.html" %}
           </div>
-          <div class="card-action-light">
+          <div class="card-action-light login-card-action">
             <button type="submit" class="btn green waves-effect waves-light">
               {% trans "Login" %}
               <i class="material-icons right">send</i>
             </button>
             {% if request.site.preferences.auth__allow_password_change and wizard.steps.current == "auth" %}
-              <a href="{% url "account_reset_password" %}" class="btn-flat right waves-effect waves-light">
+              <a href="{% url "account_reset_password" %}" class="btn-flat right waves-effect waves-red">
                 {% trans "Reset password" %}
               </a>
             {% endif %}
@@ -111,7 +111,8 @@
                 <p>{% trans "Or, alternatively, use one of your backup phones:" %}</p>
                 <p>
                   {% for other in other_devices %}
-                    <button name="challenge_device" value="{{ other.persistent_id }}" class="btn" type="submit">
+                    <button name="challenge_device" value="{{ other.persistent_id }}" class="btn margin-bottom"
+                            type="submit">
                       {{ other|device_action }}
                     </button>
                   {% endfor %}