diff --git a/src/Language/ar/Auth.php b/src/Language/ar/Auth.php
index 17fb43a68..5184ff2b2 100644
--- a/src/Language/ar/Auth.php
+++ b/src/Language/ar/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'كلمة المرور',
     'passwordConfirm' => 'كلمة المرور (مرة اخرى)',
     'haveAccount'     => 'هل لديك حساب بالفعل؟',
+    'token'           => '(To be translated) Token',
 
     // Buttons
     'confirm' => 'تاكيد',
diff --git a/src/Language/bg/Auth.php b/src/Language/bg/Auth.php
index f83fda6e9..b4bee29dd 100644
--- a/src/Language/bg/Auth.php
+++ b/src/Language/bg/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'Парола',
     'passwordConfirm' => 'Парола (отново)',
     'haveAccount'     => 'Вече имате акаунт?',
+    'token'           => '(To be translated) Token',
 
     // Бутони
     'confirm' => 'Потвърди',
diff --git a/src/Language/de/Auth.php b/src/Language/de/Auth.php
index 977feb0a6..53b67542a 100644
--- a/src/Language/de/Auth.php
+++ b/src/Language/de/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'Passwort',
     'passwordConfirm' => 'Passwort (erneut)',
     'haveAccount'     => 'Haben Sie bereits ein Konto?',
+    'token'           => '(To be translated) Token',
 
     // Buttons
     'confirm' => 'Bestätigen',
diff --git a/src/Language/en/Auth.php b/src/Language/en/Auth.php
index d9271cc78..1dfdfe7b1 100644
--- a/src/Language/en/Auth.php
+++ b/src/Language/en/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'Password',
     'passwordConfirm' => 'Password (again)',
     'haveAccount'     => 'Already have an account?',
+    'token'           => 'Token',
 
     // Buttons
     'confirm' => 'Confirm',
diff --git a/src/Language/es/Auth.php b/src/Language/es/Auth.php
index 027e7d4ec..5fdd2ae0c 100644
--- a/src/Language/es/Auth.php
+++ b/src/Language/es/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'Contraseña',
     'passwordConfirm' => 'Contraseña (otra vez)',
     'haveAccount'     => '¿Ya tienes una cuenta?',
+    'token'           => '(To be translated) Token',
 
     // Botones
     'confirm' => 'Confirmar',
diff --git a/src/Language/fa/Auth.php b/src/Language/fa/Auth.php
index 4cedff90d..c3bf118f0 100644
--- a/src/Language/fa/Auth.php
+++ b/src/Language/fa/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'رمز عبور',
     'passwordConfirm' => 'رمز عبور (تکرار)',
     'haveAccount'     => 'از قبل حساب کاربری دارید؟',
+    'token'           => 'توکن',
 
     // Buttons
     'confirm' => 'تایید',
diff --git a/src/Language/fr/Auth.php b/src/Language/fr/Auth.php
index 9bf794ea3..fb167b954 100644
--- a/src/Language/fr/Auth.php
+++ b/src/Language/fr/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'Mot de passe',
     'passwordConfirm' => 'Mot de passe (répéter)',
     'haveAccount'     => 'Vous avez déjà un compte ?',
+    'token'           => '(To be translated) Token',
 
     // Buttons
     'confirm' => 'Confirmer',
diff --git a/src/Language/id/Auth.php b/src/Language/id/Auth.php
index 62a90d8e6..0c5e1533c 100644
--- a/src/Language/id/Auth.php
+++ b/src/Language/id/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'Kata Sandi',
     'passwordConfirm' => 'Kata Sandi (lagi)',
     'haveAccount'     => 'Sudah punya akun?',
+    'token'           => '(To be translated) Token',
 
     // Buttons
     'confirm' => 'Konfirmasi',
diff --git a/src/Language/it/Auth.php b/src/Language/it/Auth.php
index dc531886a..0b4e845ac 100644
--- a/src/Language/it/Auth.php
+++ b/src/Language/it/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'Password',
     'passwordConfirm' => 'Password (ancora)',
     'haveAccount'     => 'Hai già un account?',
+    'token'           => '(To be translated) Token',
 
     // Buttons
     'confirm' => 'Conferma',
diff --git a/src/Language/ja/Auth.php b/src/Language/ja/Auth.php
index 10af048fe..7823e88cb 100644
--- a/src/Language/ja/Auth.php
+++ b/src/Language/ja/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'パスワード', // 'Password'
     'passwordConfirm' => 'パスワード（再）', // 'Password (again)'
     'haveAccount'     => 'すでにアカウントをお持ちの方', // 'Already have an account?'
+    'token'           => 'トークン', // 'Token'
 
     // Buttons
     'confirm' => '確認する', // 'Confirm'
diff --git a/src/Language/lt/Auth.php b/src/Language/lt/Auth.php
index 0b10631c0..035d80070 100644
--- a/src/Language/lt/Auth.php
+++ b/src/Language/lt/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'Slaptažodis',
     'passwordConfirm' => 'Slaptažodis (pakartoti)',
     'haveAccount'     => 'Jau turite paskyrą?',
+    'token'           => '(To be translated) Token',
 
     // Buttons
     'confirm' => 'Patvirtinti',
diff --git a/src/Language/pt-BR/Auth.php b/src/Language/pt-BR/Auth.php
index b001a9511..e4b479b5b 100644
--- a/src/Language/pt-BR/Auth.php
+++ b/src/Language/pt-BR/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'Senha',
     'passwordConfirm' => 'Senha (novamente)',
     'haveAccount'     => 'Já tem uma conta?',
+    'token'           => '(To be translated) Token',
 
     // Botões
     'confirm' => 'Confirmar',
diff --git a/src/Language/pt/Auth.php b/src/Language/pt/Auth.php
index ee7a5ab90..765db2070 100644
--- a/src/Language/pt/Auth.php
+++ b/src/Language/pt/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'Senha',
     'passwordConfirm' => 'Senha (novamente)',
     'haveAccount'     => 'Já tem uma conta?',
+    'token'           => '(To be translated) Token',
 
     // Botões
     'confirm' => 'Confirmar',
diff --git a/src/Language/sk/Auth.php b/src/Language/sk/Auth.php
index 39e286892..11579e7ba 100644
--- a/src/Language/sk/Auth.php
+++ b/src/Language/sk/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'Heslo',
     'passwordConfirm' => 'Heslo (znova)',
     'haveAccount'     => 'Máte už účet?',
+    'token'           => '(To be translated) Token',
 
     // Buttons
     'confirm' => 'Potvrdiť',
diff --git a/src/Language/sr/Auth.php b/src/Language/sr/Auth.php
index 8030c6a4d..9211ba0d4 100644
--- a/src/Language/sr/Auth.php
+++ b/src/Language/sr/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'Lozinka',
     'passwordConfirm' => 'Lozinka (ponovo)',
     'haveAccount'     => 'Već imate nalog?',
+    'token'           => '(To be translated) Token',
 
     // Buttons
     'confirm' => 'Potvrdi',
diff --git a/src/Language/sv-SE/Auth.php b/src/Language/sv-SE/Auth.php
index 1031b7963..ab206d7d5 100644
--- a/src/Language/sv-SE/Auth.php
+++ b/src/Language/sv-SE/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'Lösenord',
     'passwordConfirm' => 'Lösenord (igen)',
     'haveAccount'     => 'Har du redan ett konto?',
+    'token'           => '(To be translated) Token',
 
     // Buttons
     'confirm' => 'Bekräfta',
diff --git a/src/Language/tr/Auth.php b/src/Language/tr/Auth.php
index b54865ba5..2b35941d7 100644
--- a/src/Language/tr/Auth.php
+++ b/src/Language/tr/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'Şifre',
     'passwordConfirm' => 'Şifre (tekrar)',
     'haveAccount'     => 'Zaten hesabınız var mı?',
+    'token'           => '(To be translated) Token',
 
     // Buttons
     'confirm' => 'Onayla',
diff --git a/src/Language/uk/Auth.php b/src/Language/uk/Auth.php
index c012540ce..d54b30dd1 100644
--- a/src/Language/uk/Auth.php
+++ b/src/Language/uk/Auth.php
@@ -30,6 +30,7 @@
     'password'        => 'Пароль',
     'passwordConfirm' => 'Пароль (ще раз)',
     'haveAccount'     => 'Вже є обліковий запис?',
+    'token'           => '(To be translated) Token',
 
     // Buttons
     'confirm' => 'Підтвердити',
diff --git a/src/Views/email_activate_show.php b/src/Views/email_activate_show.php
index 491fc2fbf..9d29ef8d8 100644
--- a/src/Views/email_activate_show.php
+++ b/src/Views/email_activate_show.php
@@ -19,9 +19,10 @@
                 <?= csrf_field() ?>
 
                 <!-- Code -->
-                <div class="mb-2">
-                    <input type="text" class="form-control" name="token" placeholder="000000" inputmode="numeric"
+                <div class="form-floating mb-2">
+                    <input type="text" class="form-control" id="floatingTokenInput" name="token" placeholder="000000" inputmode="numeric"
                         pattern="[0-9]*" autocomplete="one-time-code" value="<?= old('token') ?>" required />
+                    <label for="floatingTokenInput"><?= lang('Auth.token') ?></label>
                 </div>
 
                 <div class="d-grid col-8 mx-auto m-3">
diff --git a/src/Views/login.php b/src/Views/login.php
index 34193ce19..71b4501d0 100644
--- a/src/Views/login.php
+++ b/src/Views/login.php
@@ -32,13 +32,15 @@
                     <?= csrf_field() ?>
 
                     <!-- Email -->
-                    <div class="mb-2">
-                        <input type="email" class="form-control" name="email" inputmode="email" autocomplete="email" placeholder="<?= lang('Auth.email') ?>" value="<?= old('email') ?>" required />
+                    <div class="form-floating mb-3">
+                        <input type="email" class="form-control" id="floatingEmailInput" name="email" inputmode="email" autocomplete="email" placeholder="<?= lang('Auth.email') ?>" value="<?= old('email') ?>" required />
+                        <label for="floatingEmailInput"><?= lang('Auth.email') ?></label>
                     </div>
 
                     <!-- Password -->
-                    <div class="mb-2">
-                        <input type="password" class="form-control" name="password" inputmode="text" autocomplete="current-password" placeholder="<?= lang('Auth.password') ?>" required />
+                    <div class="form-floating mb-3">
+                        <input type="password" class="form-control" id="floatingPasswordInput" name="password" inputmode="text" autocomplete="current-password" placeholder="<?= lang('Auth.password') ?>" required />
+                        <label for="floatingPasswordInput"><?= lang('Auth.password') ?></label>
                     </div>
 
                     <!-- Remember me -->
diff --git a/src/Views/magic_link_form.php b/src/Views/magic_link_form.php
index 100ce67f6..ed820717e 100644
--- a/src/Views/magic_link_form.php
+++ b/src/Views/magic_link_form.php
@@ -28,9 +28,10 @@
                 <?= csrf_field() ?>
 
                 <!-- Email -->
-                <div class="mb-2">
-                    <input type="email" class="form-control" name="email" autocomplete="email" placeholder="<?= lang('Auth.email') ?>"
+                <div class="form-floating mb-2">
+                    <input type="email" class="form-control" id="floatingEmailInput" name="email" autocomplete="email" placeholder="<?= lang('Auth.email') ?>"
                            value="<?= old('email', auth()->user()->email ?? null) ?>" required />
+                    <label for="floatingEmailInput"><?= lang('Auth.email') ?></label>
                 </div>
 
                 <div class="d-grid col-12 col-md-8 mx-auto m-3">
diff --git a/src/Views/register.php b/src/Views/register.php
index 4c8fb301e..7adba1aa3 100644
--- a/src/Views/register.php
+++ b/src/Views/register.php
@@ -28,23 +28,27 @@
                     <?= csrf_field() ?>
 
                     <!-- Email -->
-                    <div class="mb-2">
-                        <input type="email" class="form-control" name="email" inputmode="email" autocomplete="email" placeholder="<?= lang('Auth.email') ?>" value="<?= old('email') ?>" required />
+                    <div class="form-floating mb-2">
+                        <input type="email" class="form-control" id="floatingEmailInput" name="email" inputmode="email" autocomplete="email" placeholder="<?= lang('Auth.email') ?>" value="<?= old('email') ?>" required />
+                        <label for="floatingEmailInput"><?= lang('Auth.email') ?></label>
                     </div>
 
                     <!-- Username -->
-                    <div class="mb-4">
-                        <input type="text" class="form-control" name="username" inputmode="text" autocomplete="username" placeholder="<?= lang('Auth.username') ?>" value="<?= old('username') ?>" required />
+                    <div class="form-floating mb-4">
+                        <input type="text" class="form-control" id="floatingUsernameInput" name="username" inputmode="text" autocomplete="username" placeholder="<?= lang('Auth.username') ?>" value="<?= old('username') ?>" required />
+                        <label for="floatingUsernameInput"><?= lang('Auth.username') ?></label>
                     </div>
 
                     <!-- Password -->
-                    <div class="mb-2">
-                        <input type="password" class="form-control" name="password" inputmode="text" autocomplete="new-password" placeholder="<?= lang('Auth.password') ?>" required />
+                    <div class="form-floating mb-2">
+                        <input type="password" class="form-control" id="floatingPasswordInput" name="password" inputmode="text" autocomplete="new-password" placeholder="<?= lang('Auth.password') ?>" required />
+                        <label for="floatingPasswordInput"><?= lang('Auth.password') ?></label>
                     </div>
 
                     <!-- Password (Again) -->
-                    <div class="mb-5">
-                        <input type="password" class="form-control" name="password_confirm" inputmode="text" autocomplete="new-password" placeholder="<?= lang('Auth.passwordConfirm') ?>" required />
+                    <div class="form-floating mb-5">
+                        <input type="password" class="form-control" id="floatingPasswordConfirmInput" name="password_confirm" inputmode="text" autocomplete="new-password" placeholder="<?= lang('Auth.passwordConfirm') ?>" required />
+                        <label for="floatingPasswordConfirmInput"><?= lang('Auth.passwordConfirm') ?></label>
                     </div>
 
                     <div class="d-grid col-12 col-md-8 mx-auto m-3">