diff --git a/modules/Auth/Controllers/InteractController.php b/modules/Auth/Controllers/InteractController.php
index 58dae0cf..d3a387b7 100644
--- a/modules/Auth/Controllers/InteractController.php
+++ b/modules/Auth/Controllers/InteractController.php
@@ -24,7 +24,7 @@ class InteractController extends Controller
             return redirect()
                 ->back()
                 ->withInput()
-                ->with('errors', service('validation')->getErrors());
+                ->with('errors', $this->validator->getErrors());
         }
 
         $validData = $this->validator->getValidated();
diff --git a/modules/Auth/Controllers/MagicLinkController.php b/modules/Auth/Controllers/MagicLinkController.php
index 305cfe7b..46170271 100644
--- a/modules/Auth/Controllers/MagicLinkController.php
+++ b/modules/Auth/Controllers/MagicLinkController.php
@@ -45,12 +45,11 @@ class MagicLinkController extends ShieldMagicLinkController
             'new_password' => 'required|strong_password',
         ];
 
-        $userModel = new UserModel();
         if (! $this->validate($rules)) {
             return redirect()
                 ->back()
                 ->withInput()
-                ->with('errors', $userModel->errors());
+                ->with('errors', $this->validator->getErrors());
         }
 
         $validData = $this->validator->getValidated();
@@ -60,6 +59,7 @@ class MagicLinkController extends ShieldMagicLinkController
             ->user()
             ->password = $validData['new_password'];
 
+        $userModel = new UserModel();
         if (! $userModel->update(auth()->user()->id, auth()->user())) {
             return redirect()
                 ->back()
diff --git a/modules/Auth/Controllers/MyAccountController.php b/modules/Auth/Controllers/MyAccountController.php
index 7fad8a37..4e0d2687 100644
--- a/modules/Auth/Controllers/MyAccountController.php
+++ b/modules/Auth/Controllers/MyAccountController.php
@@ -35,12 +35,11 @@ class MyAccountController extends BaseController
             'new_password' => 'required|strong_password|differs[password]',
         ];
 
-        $userModel = new UserModel();
         if (! $this->validate($rules)) {
             return redirect()
                 ->back()
                 ->withInput()
-                ->with('errors', $userModel->errors());
+                ->with('errors', $this->validator->getErrors());
         }
 
         $validData = $this->validator->getValidated();
@@ -66,6 +65,7 @@ class MyAccountController extends BaseController
             ->user()
             ->password = $validData['new_password'];
 
+        $userModel = new UserModel();
         if (! $userModel->update(auth()->user()->id, auth()->user())) {
             return redirect()
                 ->back()
diff --git a/modules/Install/Controllers/InstallController.php b/modules/Install/Controllers/InstallController.php
index edd7f465..fa52f73d 100644
--- a/modules/Install/Controllers/InstallController.php
+++ b/modules/Install/Controllers/InstallController.php
@@ -290,12 +290,11 @@ class InstallController extends Controller
             'password' => 'required|strong_password',
         ];
 
-        $userModel = new UserModel();
         if (! $this->validate($rules)) {
             return redirect()
                 ->back()
                 ->withInput()
-                ->with('errors', $userModel->errors());
+                ->with('errors', $this->validator->getErrors());
         }
 
         $validData = $this->validator->getValidated();
@@ -308,6 +307,7 @@ class InstallController extends Controller
             'is_owner' => true,
         ]);
 
+        $userModel = new UserModel();
         try {
             $userModel->save($user);
         } catch (ValidationException) {
diff --git a/themes/cp_auth/login.php b/themes/cp_auth/login.php
index d2d86ba9..23851be6 100644
--- a/themes/cp_auth/login.php
+++ b/themes/cp_auth/login.php
@@ -20,7 +20,7 @@ use Modules\Auth\Config\Auth;
         required="true"
         type="email"
         inputmode="email"
-        autocomplete="email"
+        autocomplete="username"
         autofocus="autofocus"
     />
 
diff --git a/themes/cp_install/create_superadmin.php b/themes/cp_install/create_superadmin.php
index 9fe28fa7..543ffec2 100644
--- a/themes/cp_install/create_superadmin.php
+++ b/themes/cp_install/create_superadmin.php
@@ -19,6 +19,7 @@
     name="email"
     label="<?= lang('Install.form.email') ?>"
     type="email"
+    autocomplete="username"
     required="true" />
 
 <Forms.Field