diff --git a/resources/assets/stylesheets/scss/index.scss b/resources/assets/stylesheets/scss/index.scss
index ad760ad431c7773bbb7bd3806a861e48d7d41b2d..2e4fe65898c496f64a5856017d292bc049787328 100644
--- a/resources/assets/stylesheets/scss/index.scss
+++ b/resources/assets/stylesheets/scss/index.scss
@@ -207,4 +207,17 @@ $gap-between-boxes: calc($login-page-margin / 2);
         float: left !important;
 
     }
+
+    #login-footer-bottom {
+        display: flex;
+        align-items: flex-start;
+        justify-content: space-between;
+        margin-bottom: 1.5ex;
+    }
+
+    #login-footer-top {
+        display: flex;
+        align-items: flex-start;
+        justify-content: space-between;
+    }
 }
diff --git a/templates/_standard_loginform.php b/templates/_standard_loginform.php
index a300cb608e0c1123f05f8c514027c885bfed5e24..7174287f060b15d8d0430b674fd0e3de51e94b09 100644
--- a/templates/_standard_loginform.php
+++ b/templates/_standard_loginform.php
@@ -65,7 +65,7 @@ $password_tooltip_text = (string)Config::get()->PASSWORD_TOOLTIP_TEXT;
     <input type="hidden" name="login_ticket" value="<?= Seminar_Session::get_ticket() ?>">
     <input type="hidden" name="resolution"  value="">
 
-    <div style="display: flex; align-items: flex-start; justify-content: space-between; height: 70px;">
+    <div id="<?=$login_footer_id?>">
         <?= Button::createAccept(_('Anmelden'), _('Login'), ['id' => 'submit_login']); ?>
 
         <? if (Config::get()->ENABLE_REQUEST_NEW_PASSWORD_BY_USER && in_array('Standard', $GLOBALS['STUDIP_AUTH_PLUGIN'])): ?>
diff --git a/templates/loginform.php b/templates/loginform.php
index e36f110241f04237fbdba9d5482e5d10edadb215..69fc1f06ab65df91b7740e656c7785e7ac5378ee 100644
--- a/templates/loginform.php
+++ b/templates/loginform.php
@@ -52,6 +52,7 @@ $show_hidden_login = !$show_login && StudipAuthAbstract::isLoginEnabled();
                 <? if ($show_login) : ?>
                     <?= $this->render_partial('_standard_loginform', [
                         'hidden' => false,
+                        'login_footer_id' => 'login-footer-top'
                     ]) ?>
                 <? endif ?>
                 <nav>
@@ -80,6 +81,7 @@ $show_hidden_login = !$show_login && StudipAuthAbstract::isLoginEnabled();
                 <? if ($show_hidden_login) : ?>
                     <?= $this->render_partial('_standard_loginform', [
                         'hidden' => empty($loginerror),
+                        'login_footer_id' => 'login-footer-bottom'
                     ]) ?>
                 <? endif ?>