diff --git a/web/themes/custom/doljak_theme/css/base/auth-styling.css b/web/themes/custom/doljak_theme/css/base/auth-styling.css
index 8826a83..d0f3ab3 100644
--- a/web/themes/custom/doljak_theme/css/base/auth-styling.css
+++ b/web/themes/custom/doljak_theme/css/base/auth-styling.css
@@ -158,6 +158,13 @@
   width: 100%;
 }
 
+.auth-card > .auth-form,
+.auth-card form.auth-form {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+}
+
 .auth-card__title {
   color: var(--color-text-primary);
   font-family: var(--font-display);
@@ -328,6 +335,13 @@
   margin-bottom: 0;
 }
 
+.auth-form .form-actions {
+  display: flex;
+  flex-direction: column;
+  margin: 0;
+  width: 100%;
+}
+
 .auth-form__row {
   align-items: center;
   display: flex;
diff --git a/web/themes/custom/doljak_theme/templates/form--user-login-form.html.twig b/web/themes/custom/doljak_theme/templates/form--user-login-form.html.twig
index 26e8fc4..74610d4 100644
--- a/web/themes/custom/doljak_theme/templates/form--user-login-form.html.twig
+++ b/web/themes/custom/doljak_theme/templates/form--user-login-form.html.twig
@@ -23,7 +23,7 @@
       <h2 class="auth-card__title">Login</h2>
       <p class="auth-card__subtitle">Use your account name and password.</p>
 
-      <form {{ attributes }}>
+      <form{{ attributes }}>
         {{ element.name }}
         <div class="auth-form__row">
           <a href="/user/password" class="auth-link">Forgot password?</a>
@@ -33,12 +33,10 @@
         {{ element.form_token }}
         {{ element.form_build_id }}
         {{ element.form_id }}
-        
-        </form>
-        <a href="/user/register" class="btn btn--secondary btn--full">Create Account</a>
+      </form>
 
+      <a href="/user/register" class="btn btn--secondary btn--full">Create Account</a>
     </div>
 
   </div>
 </section>
-
diff --git a/web/themes/custom/doljak_theme/templates/form--user-logout-confirm.html.twig b/web/themes/custom/doljak_theme/templates/form--user-logout-confirm.html.twig
index 34dfa2f..14396c7 100644
--- a/web/themes/custom/doljak_theme/templates/form--user-logout-confirm.html.twig
+++ b/web/themes/custom/doljak_theme/templates/form--user-logout-confirm.html.twig
@@ -13,11 +13,12 @@
         Confirm to leave your account on this device.
       </p>
 
-      {{ element.actions }}
+      <form{{ attributes }}>
+        {{ element.actions }}
+        {{ element.form_token }}
+        {{ element.form_build_id }}
+        {{ element.form_id }}
+      </form>
     </div>
   </div>
 </section>
-
-{{ element.form_token }}
-{{ element.form_build_id }}
-{{ element.form_id }}
diff --git a/web/themes/custom/doljak_theme/templates/form--user-pass.html.twig b/web/themes/custom/doljak_theme/templates/form--user-pass.html.twig
index 870c7d9..7230588 100644
--- a/web/themes/custom/doljak_theme/templates/form--user-pass.html.twig
+++ b/web/themes/custom/doljak_theme/templates/form--user-pass.html.twig
@@ -9,17 +9,21 @@
     <form {{ attributes }}>
     <div class="auth-card auth-card--centered">
 
+      <form{{ attributes }}>
         {{ element.name }}
         {{ element.form_token }}
         {{ element.form_build_id }}
         {{ element.form_id }}
 
         {{ element.actions }}
+        {{ element.form_token }}
+        {{ element.form_build_id }}
+        {{ element.form_id }}
 
         <a href="/user/login" class="auth-link auth-link--center">Back to login</a>
+      </form>
 
     </div>
     </form>
   </div>
 </section>
-
diff --git a/web/themes/custom/doljak_theme/templates/form--user-register-form.html.twig b/web/themes/custom/doljak_theme/templates/form--user-register-form.html.twig
index b98fb70..c0874aa 100644
--- a/web/themes/custom/doljak_theme/templates/form--user-register-form.html.twig
+++ b/web/themes/custom/doljak_theme/templates/form--user-register-form.html.twig
@@ -13,6 +13,7 @@
       <h2 class="auth-card__title">Create Account</h2>
       <p class="auth-card__subtitle">Basic information to get started.</p>
 
+      <form{{ attributes }}>
 
         {{ element.account.name }}
 
@@ -21,6 +22,9 @@
         {{ element.account.pass }}
 
         {{ element.actions }}
+        {{ element.form_token }}
+        {{ element.form_build_id }}
+        {{ element.form_id }}
 
         {{ element.form_token }}
         {{ element.form_build_id }}
@@ -30,8 +34,8 @@
           Already have an account? <a href="/user/login" class="auth-link">Sign in</a>
         </p>
 
+      </form>
     </div>
     </form>
   </div>
 </section>
-