diff --git a/src/auth/login.blade.php b/src/auth/login.blade.php
index 537dd11..95ac0b4 100644
--- a/src/auth/login.blade.php
+++ b/src/auth/login.blade.php
@@ -58,11 +58,13 @@ class="form-control @error('password') is-invalid @enderror" name="password"
 
                             <div class="form-group row">
                                 <div class="col-md-8 offset-md-4">
-                                    <div class="form-check">
-                                        <input class="form-check-input" type="checkbox" name="remember" id="remember"
-                                            {{ old('remember') ? 'checked' : '' }}>
-
-                                        <label class="form-check-label" for="remember">
+                                    <div class="form-group d-flex align-items-center form-group--gapped">
+                                        <div>
+                                            <input class="form-control d-flex align-items-center" type="checkbox" name="remember" id="remember"
+                                                {{ old('remember') ? 'checked' : '' }}>
+                                        </div>
+                                        
+                                        <label class="col-form-label p-0" for="remember">
                                             {{ __('interface.actions.remember_me') }}
                                         </label>
                                     </div>
diff --git a/src/auth/register.blade.php b/src/auth/register.blade.php
index ae3de48..5c67567 100644
--- a/src/auth/register.blade.php
+++ b/src/auth/register.blade.php
@@ -92,15 +92,15 @@ class="col-md-4 col-form-label text-md-right">{{ __('interface.data.confirm_pass
                                     <div class="row">
                                         <div class="col-md-8 offset-md-4">
                                             <div class="form-group bg-white border rounded py-2 px-3">
-                                                <div class="row">
-                                                    <div class="col-md-2">
+                                                <div class="form-group d-flex align-items-center form-group--gapped mb-0">
+                                                    <div>
                                                         <input id="accept_{{ $accept->id }}" type="checkbox"
-                                                            class="form-control" name="accept_{{ $accept->id }}"
+                                                            class="form-control d-flex align-items-center" name="accept_{{ $accept->id }}"
                                                             value="true">
                                                     </div>
 
                                                     <label for="accept_{{ $accept->id }}"
-                                                        class="col-md-10 col-form-label">{!! __('interface.misc.accept_notice', [
+                                                        class="col-form-label p-0">{!! __('interface.misc.accept_notice', [
                                                             'link' =>
                                                                 '<a href="' .
                                                                 (Route::has($accept->route) ? route($accept->route) : $accept->route) .
diff --git a/src/lang/de/interface.php b/src/lang/de/interface.php
index 787e872..822e48c 100644
--- a/src/lang/de/interface.php
+++ b/src/lang/de/interface.php
@@ -274,6 +274,7 @@
         'verifying'        => 'Wird verifiziert',
     ],
     'misc' => [
+        'accept_notice'                      => 'Ich habe das Dokument :link (Stand: :date) gelesen und akzeptiere die aufgeführten Bedingungen.',
         'performance'                        => 'Leistung',
         'instance'                           => 'Instanz',
         'contract'                           => 'Vertrag',
diff --git a/src/lang/en/interface.php b/src/lang/en/interface.php
index 0ccf56d..5e7153b 100644
--- a/src/lang/en/interface.php
+++ b/src/lang/en/interface.php
@@ -274,6 +274,7 @@
         'verifying'        => 'Verifying',
     ],
     'misc' => [
+        'accept_notice'                      => 'I have read the document :link (as of :date) and accept the terms and conditions.',
         'performance'                        => 'Performance',
         'instance'                           => 'Instance',
         'contract'                           => 'Contract',
diff --git a/src/scss/app.scss b/src/scss/app.scss
index 41796b4..77138bb 100644
--- a/src/scss/app.scss
+++ b/src/scss/app.scss
@@ -826,3 +826,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
         transform: translate(50%, -50%);
     }
 }
+
+.form-group--gapped {
+    gap: 0.75rem;
+}