diff --git a/.env.example b/.env.example
index be988ee..b51034f 100644
--- a/.env.example
+++ b/.env.example
@@ -13,8 +13,6 @@ ITEM_SUBTYPE_ID=Q6OV9dk5dE
 
 EXCEPTION_NOTIFICATION_EMAIL=
 
-APP_HASH_SALT_FORGOT_PASSWORD=
-
 LOG_CHANNEL=stack
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
diff --git a/app/Actions/Account/CreateNewPassword.php b/app/Actions/Account/CreateNewPassword.php
new file mode 100644
index 0000000..533a310
--- /dev/null
+++ b/app/Actions/Account/CreateNewPassword.php
@@ -0,0 +1,45 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Actions\Account;
+
+use App\Actions\Action;
+use App\Api\Service;
+
+/**
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
+ * https://github.com/costs-to-expect/budget/blob/main/LICENSE
+ */
+class CreateNewPassword extends Action
+{
+    public function __invoke(
+        Service $api,
+        array $input
+    ): int
+    {
+        $post_response = $api->createNewPassword($input);
+
+        if ($post_response['status'] === 204) {
+            return 204;
+        }
+
+        if ($post_response['status'] === 422) {
+            $this->validation_errors = $post_response['fields'];
+            $this->parameters = [
+                'encrypted_token' => $input['encrypted_token'],
+                'email' => $input['email'],
+            ];
+
+            return 422;
+        }
+
+        $this->message = $post_response['content'];
+        $this->parameters = [
+            'encrypted_token' => $input['encrypted_token'],
+            'email' => $input['email'],
+        ];
+
+        return $post_response['status'];
+    }
+}
\ No newline at end of file
diff --git a/app/Actions/Account/CreatePassword.php b/app/Actions/Account/CreatePassword.php
new file mode 100644
index 0000000..14deb85
--- /dev/null
+++ b/app/Actions/Account/CreatePassword.php
@@ -0,0 +1,56 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Actions\Account;
+
+use App\Actions\Action;
+use App\Api\Service;
+use App\Models\PartialRegistration;
+use App\Notifications\Registered;
+use Illuminate\Support\Facades\Notification;
+
+/**
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
+ * https://github.com/costs-to-expect/budget/blob/main/LICENSE
+ */
+class CreatePassword extends Action
+{
+    public function __invoke(
+        Service $api,
+        array $input
+    ): int
+    {
+        $post_response = $api->createPassword($input);
+
+        if ($post_response['status'] === 204) {
+
+            Notification::route('mail', $input['email'])
+                ->notify(new Registered());
+
+            PartialRegistration::query()
+                ->where('token', '=', $input['token'])
+                ->delete();
+
+            return 204;
+        }
+
+        if ($post_response['status'] === 422) {
+            $this->validation_errors = $post_response['fields'];
+            $this->parameters = [
+                'token' => $input['token'],
+                'email' => $input['email'],
+            ];
+
+            return 422;
+        }
+
+        $this->message = $post_response['content'];
+        $this->parameters = [
+            'token' => $input['token'],
+            'email' => $input['email'],
+        ];
+
+        return $post_response['status'];
+    }
+}
\ No newline at end of file
diff --git a/app/Actions/Account/ForgotPassword.php b/app/Actions/Account/ForgotPassword.php
new file mode 100644
index 0000000..e2d18db
--- /dev/null
+++ b/app/Actions/Account/ForgotPassword.php
@@ -0,0 +1,48 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Actions\Account;
+
+use App\Actions\Action;
+use App\Api\Service;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Notification;
+
+/**
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
+ * https://github.com/costs-to-expect/budget/blob/main/LICENSE
+ */
+class ForgotPassword extends Action
+{
+    public function __invoke(
+        Service $api,
+        array $input
+    ): int
+    {
+        $post_response = $api->forgotPassword($input);
+
+        if ($post_response['status'] === 201) {
+
+            $this->parameters = $post_response['content']['uris']['create-new-password']['parameters'];
+
+            Notification::route('mail', $input['email'])
+                ->notify(new \App\Notifications\ForgotPassword($input['email'], $this->parameters['encrypted_token']));
+
+            return 201;
+        }
+
+        if ($post_response['status'] === 422) {
+            $this->validation_errors = $post_response['fields'];
+
+            return 422;
+        }
+
+        $this->message = $post_response['content'];
+        $this->parameters = [
+            'email' => $input['email'],
+        ];
+
+        return $post_response['status'];
+    }
+}
\ No newline at end of file
diff --git a/app/Actions/Account/Register.php b/app/Actions/Account/Register.php
new file mode 100644
index 0000000..c36b6c2
--- /dev/null
+++ b/app/Actions/Account/Register.php
@@ -0,0 +1,51 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Actions\Account;
+
+use App\Actions\Action;
+use App\Api\Service;
+use App\Models\PartialRegistration;
+use App\Notifications\CreatePassword;
+use Illuminate\Support\Facades\Notification;
+
+/**
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
+ * https://github.com/costs-to-expect/budget/blob/main/LICENSE
+ */
+class Register extends Action
+{
+    public function __invoke(
+        Service $api,
+        array $input
+    ): int
+    {
+        $post_response = $api->register($input);
+
+        if ($post_response['status'] === 201) {
+
+            $this->parameters = $post_response['content']['uris']['create-password']['parameters'];
+
+            $model = new PartialRegistration();
+            $model->token = $this->parameters['token'];
+            $model->email = $this->parameters['email'];
+            $model->save();
+
+            Notification::route('mail', $input['email'])
+                ->notify((new CreatePassword($input['email'], $this->parameters['token']))->delay(now()->addMinute()));
+
+            return 201;
+        }
+
+        if ($post_response['status'] === 422) {
+            $this->validation_errors = $post_response['fields'];
+
+            return 422;
+        }
+
+        $this->message = $post_response['content'];
+
+        return $post_response['status'];
+    }
+}
\ No newline at end of file
diff --git a/app/Actions/Account/SignIn.php b/app/Actions/Account/SignIn.php
new file mode 100644
index 0000000..9d8b7f7
--- /dev/null
+++ b/app/Actions/Account/SignIn.php
@@ -0,0 +1,44 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Actions\Account;
+
+use App\Actions\Action;
+use Illuminate\Support\Facades\Auth;
+
+/**
+ * @author Dean Blackborough <dean@g3d-development.com>
+ * @copyright Dean Blackborough (Costs to Expect) 2018-2023
+ * https://github.com/costs-to-expect/budget/blob/main/LICENSE
+ */
+class SignIn extends Action
+{
+    public function __invoke(
+        array $input
+    ): int
+    {
+        if (array_key_exists('email', $input) === false || $input['email'] === null) {
+            $this->validation_errors['email']['errors'] = [
+                'You need to provide your email address'
+            ];
+        }
+        if (array_key_exists('password', $input) === false || $input['password'] === null) {
+            $this->validation_errors['password']['errors'] = [
+                'You need to provide your password'
+            ];
+        }
+
+        if ($this->validation_errors !== []) {
+            return 422;
+        }
+
+
+        if (Auth::attempt($input, array_key_exists('remember_me', $input))) {
+            return 204;
+        }
+
+        $this->validation_errors = Auth::errors();
+
+        return 422;
+    }
+}
\ No newline at end of file
diff --git a/app/Actions/Action.php b/app/Actions/Action.php
index 21c5bcd..efbdbd2 100644
--- a/app/Actions/Action.php
+++ b/app/Actions/Action.php
@@ -14,13 +14,20 @@ abstract class Action
 
     protected array $validation_errors = [];
 
-    public function getValidationErrors(): array
-    {
-        return $this->validation_errors;
-    }
+    protected array $parameters = [];
 
     public function getMessage(): string
     {
         return $this->message;
     }
+
+    public function getParameters(): array
+    {
+        return $this->parameters;
+    }
+
+    public function getValidationErrors(): array
+    {
+        return $this->validation_errors;
+    }
 }
diff --git a/app/Api/Service.php b/app/Api/Service.php
index f75b76b..e61333d 100644
--- a/app/Api/Service.php
+++ b/app/Api/Service.php
@@ -168,7 +168,7 @@ public function createPassword(array $payload): array
     #[ArrayShape(['status' => "integer", 'content' => "array", 'fields' => "array"])]
     public function createNewPassword(array $payload): array
     {
-        $uri = Uri::createNewPassword($payload['token'], $payload['email']);
+        $uri = Uri::createNewPassword($payload['encrypted_token'], $payload['email']);
 
         return $this->http->post(
             $uri['uri'],
diff --git a/app/Api/Uri.php b/app/Api/Uri.php
index 74068f7..b292da4 100644
--- a/app/Api/Uri.php
+++ b/app/Api/Uri.php
@@ -58,7 +58,7 @@ public static function createPassword(string $token, string $email): array
     #[ArrayShape(['uri' => "string", 'name' => "string"])]
     public static function createNewPassword(string $token, string $email): array
     {
-        $uri = '/' . self::VERSION . '/auth/create-new-password?token=' .
+        $uri = '/' . self::VERSION . '/auth/create-new-password?encrypted_token=' .
             urlencode($token) . '&email=' . urlencode($email);
 
         return [
diff --git a/app/Auth/Guard/Api/Guard.php b/app/Auth/Guard/Api/Guard.php
index a3db841..c000305 100644
--- a/app/Auth/Guard/Api/Guard.php
+++ b/app/Auth/Guard/Api/Guard.php
@@ -101,13 +101,8 @@ public function validate(array $credentials = [], bool $remember_me = false): bo
             return true;
         }
 
-        if ($response['status'] === 422) {
-            $this->errors = $response['content']['fields'];
-            return false;
-        }
-
-        if ($response['status'] === 401) {
-            $this->errors = ['email' => [$response['content']]];
+        if ($response['status'] === 422 || $response['status'] === 401) {
+            $this->errors = $response['fields'];
             return false;
         }
 
diff --git a/app/Http/Controllers/Authentication.php b/app/Http/Controllers/Authentication.php
index 1acd7a1..a530d47 100644
--- a/app/Http/Controllers/Authentication.php
+++ b/app/Http/Controllers/Authentication.php
@@ -3,16 +3,12 @@
 
 namespace App\Http\Controllers;
 
+use App\Actions\Account\Register;
+use App\Actions\Account\SignIn;
 use App\Api\Service;
-use App\Models\PartialRegistration;
-use App\Notifications\CreatePassword;
-use App\Notifications\ForgotPassword;
-use App\Notifications\Registered;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\Notification;
 
 /**
  * @author Dean Blackborough <dean@g3d-development.com>
@@ -21,49 +17,63 @@
  */
 class Authentication extends Controller
 {
-    public function createPassword(Request $request)
+    public function createNewPassword(Request $request)
     {
-        $token = null;
+        $encrypted_token = null;
         $email = null;
 
-        if (session()->get('authentication.parameters') !== null) {
-            $token = session()->get('authentication.parameters')['token'];
-            $email = session()->get('authentication.parameters')['email'];
+        if ($request->query('encrypted_token') !== null && $request->query('email') !== null) {
+            $encrypted_token = $request->query('encrypted_token');
+            $email = $request->query('email');
         }
 
-        if ($request->input('token') !== null && $request->input('email') !== null) {
-            $token = $request->input('token');
-            $email = $request->input('email');
-        }
-
-        if ($token === null && $email === null) {
+        if ($encrypted_token === null && $email === null) {
             abort(404, 'Password cannot be created, registration parameters not found');
         }
 
         return view(
-            'authentication.create-password',
+            'authentication.create-new-password',
             [
-                'token' => $token,
+                'encrypted_token' => $encrypted_token,
                 'email' => $email,
-                'errors' => session()->get('authentication.errors'),
-                'failed' => session()->get('authentication.failed'),
+                'errors' => session()->get('validation.errors'),
+                'failed' => session()->get('request.failed'),
             ]
         );
     }
 
-    public function createNewPassword(Request $request)
+    public function createNewPasswordProcess(Request $request)
     {
-        $token = null;
-        $email = null;
+        $api = new Service();
 
-        if (session()->get('authentication.parameters') !== null) {
-            $token = session()->get('authentication.parameters')['token'];
-            $email = session()->get('authentication.parameters')['email'];
+        $action = new \App\Actions\Account\CreateNewPassword();
+        $result = $action(
+            $api,
+            $request->only(['encrypted_token', 'email', 'password', 'password_confirmation'])
+        );
+
+        if ($result === 204) {
+            return redirect()->route('new-password-created');
         }
 
-        if ($request->input('token') !== null && $request->input('email') !== null) {
-            $token = $request->input('token');
-            $email = $request->input('email');
+        if ($result === 422) {
+            return redirect()->route('create-new-password.view', $action->getParameters())
+                ->withInput()
+                ->with('validation.errors', $action->getValidationErrors());
+        }
+
+        return redirect()->route('create-new-password.view',$action->getParameters())
+            ->with('request.failed', $action->getMessage());
+    }
+
+    public function createPassword(Request $request)
+    {
+        $token = null;
+        $email = null;
+
+        if ($request->query('token') !== null && $request->query('email') !== null) {
+            $token = $request->query('token');
+            $email = $request->query('email');
         }
 
         if ($token === null && $email === null) {
@@ -71,46 +81,38 @@ public function createNewPassword(Request $request)
         }
 
         return view(
-            'authentication.create-new-password',
+            'authentication.create-password',
             [
                 'token' => $token,
                 'email' => $email,
-                'errors' => session()->get('authentication.errors'),
-                'failed' => session()->get('authentication.failed'),
+                'errors' => session()->get('validation.errors'),
+                'failed' => session()->get('request.failed'),
             ]
         );
     }
 
-    public function createNewPasswordProcess(Request $request)
+    public function createPasswordProcess(Request $request): RedirectResponse
     {
         $api = new Service();
 
-        $response = $api->createNewPassword(
+        $action = new \App\Actions\Account\CreatePassword();
+        $result = $action(
+            $api,
             $request->only(['token', 'email', 'password', 'password_confirmation'])
         );
 
-        if ($response['status'] === 204) {
-            return redirect()->route('new-password-created');
+        if ($result === 204) {
+            return redirect()->route('registration-complete');
         }
 
-        if ($response['status'] === 422) {
-            return redirect()->route(
-                'create-new-password.view',
-                [
-                    'token' => $request->input('token'),
-                    'email' => $request->input('email'),
-                ])
+        if ($result === 422) {
+            return redirect()->route('create-password.view', $action->getParameters())
                 ->withInput()
-                ->with('authentication.errors', $response['fields']);
+                ->with('validation.errors', $action->getValidationErrors());
         }
 
-        return redirect()->route(
-            'create-new-password.view',
-            [
-                'token' => $request->input('token'),
-                'email' => $request->input('email'),
-            ])
-            ->with('authentication.failed', $response['content']);
+        return redirect()->route('create-password.view', $action->getParameters())
+            ->with('request.failed', $action->getMessage());
     }
 
     public function forgotPassword()
@@ -118,8 +120,8 @@ public function forgotPassword()
         return view(
             'authentication.forgot-password',
             [
-                'errors' => session()->get('authentication.errors'),
-                'failed' => session()->get('authentication.failed'),
+                'errors' => session()->get('validation.errors'),
+                'failed' => session()->get('request.failed'),
             ]
         );
     }
@@ -128,90 +130,22 @@ public function forgotPasswordProcess(Request $request)
     {
         $api = new Service();
 
-        $response = $api->forgotPassword(
-            $request->only(['email'])
-        );
-
-        if ($response['status'] === 201) {
-
-            $config = Config::get('app.config');
-            $encryptor = new \Illuminate\Encryption\Encrypter($config['forgot-password-salt']);
-            $parameters = $response['content']['uris']['create-new-password']['parameters'];
-            $token = $encryptor->decryptString($parameters['encrypted_token']);
-
-            Notification::route('mail', $request->input('email'))
-                ->notify(new ForgotPassword($request->input('email'), $token));
+        $action = new \App\Actions\Account\ForgotPassword();
+        $result = $action($api,$request->only(['email']));
 
+        if ($result === 201) {
             return redirect()->route('forgot-password-email-issued');
         }
 
-        if ($response['status'] === 422) {
+        if ($result === 422) {
             return redirect()->route('forgot-password.view')
                 ->withInput()
-                ->with('authentication.errors', $response['fields']);
+                ->with('validation.errors', $action->getValidationErrors());
         }
 
         return redirect()->route('forgot-password.view')
             ->withInput()
-            ->with('authentication.failed', $response['content']);
-    }
-
-    public function forgotPasswordEmailIssued()
-    {
-        return view(
-            'authentication.forgot-password-email-issued',
-            [
-            ]
-        );
-    }
-
-    public function newPasswordCreated()
-    {
-        return view(
-            'authentication.new-password-created',
-            [
-            ]
-        );
-    }
-
-    public function createPasswordProcess(Request $request)
-    {
-        $api = new Service();
-
-        $response = $api->createPassword(
-            $request->only(['token', 'email', 'password', 'password_confirmation'])
-        );
-
-        if ($response['status'] === 204) {
-
-            Notification::route('mail', $request->input('email'))
-                ->notify(new Registered());
-
-            PartialRegistration::query()
-                ->where('token', '=', $request->input('token'))
-                ->delete();
-
-            return redirect()->route('registration-complete');
-        }
-
-        if ($response['status'] === 422) {
-            return redirect()->route(
-                'create-password.view',
-                [
-                    'token' => $request->input('token'),
-                    'email' => $request->input('email'),
-                ])
-                ->withInput()
-                ->with('authentication.errors', $response['fields']);
-        }
-
-        return redirect()->route(
-            'create-password.view',
-            [
-                'token' => $request->input('token'),
-                'email' => $request->input('email'),
-            ])
-            ->with('authentication.failed', $response['content']);
+            ->with('request.failed', $action->getMessage());
     }
 
     public function register()
@@ -219,52 +153,38 @@ public function register()
         return view(
             'authentication.register',
             [
-                'errors' => session()->get('authentication.errors'),
-                'failed' => session()->get('authentication.failed'),
+                'errors' => session()->get('validation.errors'),
+                'failed' => session()->get('request.failed'),
             ]
         );
     }
 
-    public function registerProcess(Request $request)
+    public function registerProcess(Request $request): RedirectResponse
     {
         $api = new Service();
 
-        $response = $api->register(
+        $action = new Register();
+        $result = $action(
+            $api,
             $request->only(['name','email'])
         );
 
-        if ($response['status'] === 201) {
-            $parameters = $response['content']['uris']['create-password']['parameters'];
+        if ($result === 201) {
 
-            $model = new PartialRegistration();
-            $model->token = $parameters['token'];
-            $model->email = $parameters['email'];
-            $model->save();
-
-            Notification::route('mail', $request->input('email'))
-                ->notify((new CreatePassword($parameters['email'], $parameters['token']))->delay(now()->addMinute()));
-
-            return redirect()->route('create-password.view')
-                ->with('authentication.parameters', $parameters);
+            return redirect()->route(
+                'create-password.view',
+                $action->getParameters()
+            );
         }
 
-        if ($response['status'] === 422) {
+        if ($result === 422) {
             return redirect()->route('register.view')
                 ->withInput()
-                ->with('authentication.errors', $response['fields']);
+                ->with('validation.errors', $action->getValidationErrors());
         }
 
         return redirect()->route('register.view')
-            ->with('authentication.failed', $response['content']);
-    }
-
-    public function registrationComplete()
-    {
-        return view(
-            'authentication.registration-complete',
-            [
-            ]
-        );
+            ->with('request.failed', $action->getMessage());
     }
 
     public function signIn()
@@ -272,25 +192,25 @@ public function signIn()
         return view(
             'authentication.sign-in',
             [
-                'errors' => session()->get('authentication.errors')
+                'errors' => session()->get('validation.errors')
             ]
         );
     }
 
     public function signInProcess(Request $request)
     {
-        $credentials = $request->only(['email', 'password']);
+        $action = new SignIn();
+        $result = $action(
+            $request->only(['email', 'password', 'remember_me'])
+        );
 
-        if (Auth::attempt($credentials, $request->input('remember_me') !== null)) {
-            return redirect()->route('home');
+        if ($result === 422) {
+            return redirect()->route('sign-in.view')
+                ->withInput()
+                ->with('validation.errors', $action->getValidationErrors());
         }
 
-        return redirect()->route('sign-in.view')
-            ->withInput()
-            ->with(
-                'authentication.errors',
-                Auth::errors()
-            );
+        return redirect()->route('home');
     }
 
     public function signOut(): RedirectResponse
diff --git a/app/Notifications/ForgotPassword.php b/app/Notifications/ForgotPassword.php
index 8aa5656..44b86ed 100644
--- a/app/Notifications/ForgotPassword.php
+++ b/app/Notifications/ForgotPassword.php
@@ -31,7 +31,7 @@ public function toMail($notifiable)
             ->subject('Budget: Create a new Password!')
             ->greeting('Hi Budgeteer!')
             ->line('Please find below the link to create a new password for your account.')
-            ->action('Create Password', url('/create-new-password') . '?token=' . urlencode($this->token) . '&email=' . urlencode($this->email))
+            ->action('Create Password', url('/create-new-password') . '?encrypted_token=' . urlencode($this->token) . '&email=' . urlencode($this->email))
             ->line('If you did not start this request, please ignore it, let us know privately if it continues to happen.')
             ->line('Thank you for using Budget, we hope it helps!');
     }
diff --git a/app/View/Components/ValidationErrorMessage.php b/app/View/Components/ValidationErrorMessage.php
index 37258b8..2f1aa29 100644
--- a/app/View/Components/ValidationErrorMessage.php
+++ b/app/View/Components/ValidationErrorMessage.php
@@ -8,16 +8,12 @@ class ValidationErrorMessage extends Component
 {
     private array $errors;
 
-    public function __construct(string $field, bool $oldStyle = false)
+    public function __construct(string $field)
     {
         $errors = session()->get('validation.errors');
 
         if (is_array($errors) && array_key_exists($field, $errors) === true) {
-            if ($oldStyle === true) {
-                $this->errors = $errors[$field];
-            } else {
-                $this->errors = $errors[$field]['errors'];
-            }
+            $this->errors = $errors[$field]['errors'];
         } else {
             $this->errors = [];
         }
diff --git a/config/app/config.php b/config/app/config.php
index b908d0a..9c7e2cd 100644
--- a/config/app/config.php
+++ b/config/app/config.php
@@ -10,9 +10,8 @@
     'item_subtype_id' => env('ITEM_SUBTYPE_ID'),
     'cookie_user' => env('SESSION_NAME_USER'),
     'cookie_bearer' => env('SESSION_NAME_BEARER'),
-    'version' => 'v1.07.0',
-    'release_date' => '18th January 2023',
+    'version' => 'v1.08.0',
+    'release_date' => '30th January 2023',
     'exception_notification_email' => env('EXCEPTION_NOTIFICATION_EMAIL'),
-    'timezone' => 'UTC', // We can allow users to override this later,
-    'forgot-password-salt' => env('APP_HASH_SALT_FORGOT_PASSWORD'),
+    'timezone' => 'UTC', // We can allow users to override this later
 ];
diff --git a/resources/views/account/change-password.blade.php b/resources/views/account/change-password.blade.php
index 5b59aa4..3643fff 100644
--- a/resources/views/account/change-password.blade.php
+++ b/resources/views/account/change-password.blade.php
@@ -41,14 +41,14 @@
                                 <label for="password" class="form-label">New Password</label>
                                 <input type="password" name="password" class="form-control <x-validation-error field='password' />" id="password" aria-describedby="password-help" required value="{{ old('password') }}" />
                                 <div id="password-help" class="form-text">Please enter your new password, at least 12 characters please, <em>your password will be hashed</em>.</div>
-                                <x-validation-error-message field="password" :oldStyle="true" />
+                                <x-validation-error-message field="password" />
                             </div>
 
                             <div class=col-12">
                                 <label for="password_confirmation" class="form-label">Confirm password</label>
                                 <input type="password" name="password_confirmation" class="form-control <x-validation-error field='password_confirmation' />" id="password_confirmation" aria-describedby="password_confirmation-help" required value="{{ old('password_confirmation') }}" />
                                 <div id="password_confirmation-help" class="form-text">Please enter your password again, we just need to confirm you didn't make a typo.</div>
-                                <x-validation-error-message field="password_confirmation" :oldStyle="true" />
+                                <x-validation-error-message field="password_confirmation" />
                             </div>
 
                             <div class=col-12">
diff --git a/resources/views/account/update-profile.blade.php b/resources/views/account/update-profile.blade.php
index c5b3ecb..5563347 100644
--- a/resources/views/account/update-profile.blade.php
+++ b/resources/views/account/update-profile.blade.php
@@ -41,14 +41,14 @@
                                 <label for="email" class="form-label">Email</label>
                                 <input type="email" name="email" class="form-control <x-validation-error field='email' />" id="email" aria-describedby="email-help" required value="{{ old('email', $user['content']['email']) }}" />
                                 <div id="email-help" class="form-text">Your email address, update if necessary.</div>
-                                <x-validation-error-message field="email" :oldStyle="true" />
+                                <x-validation-error-message field="email" />
                             </div>
 
                             <div class=col-12">
                                 <label for="name" class="form-label">Name</label>
                                 <input type="text" name="name" class="form-control <x-validation-error field='name' />" id="name" aria-describedby="name-help" required value="{{ old('name', $user['content']['name']) }}" />
                                 <div id="name-help" class="form-text">Your name, update if necessary.</div>
-                                <x-validation-error-message field="name" :oldStyle="true" />
+                                <x-validation-error-message field="name" />
                             </div>
 
                             <div class=col-12">
diff --git a/resources/views/authentication/create-new-password.blade.php b/resources/views/authentication/create-new-password.blade.php
index 8da8238..486bb5e 100644
--- a/resources/views/authentication/create-new-password.blade.php
+++ b/resources/views/authentication/create-new-password.blade.php
@@ -81,30 +81,18 @@
 
                 <div class="mt-3 mb-3">
                     <label for="password" class="form-label">Password</label>
-                    <input type="password" name="password" class="form-control @if($errors !== null && array_key_exists('password', $errors)) is-invalid @endif" id="password" aria-describedby="password-help" required value="{{ old('password') }}" />
+                    <input type="password" name="password" class="form-control <x-validation-error field='password' />" id="password" aria-describedby="password-help" required value="{{ old('password') }}" />
                     <div id="password-help" class="form-text">Please enter a password, at least 12 characters please, <em>your password will be hashed</em>.</div>
-                    @if($errors !== null && array_key_exists('password', $errors))
-                        <div class="invalid-feedback">
-                            @foreach ($errors['password'] as $error)
-                                {{ $error }}
-                            @endforeach
-                        </div>
-                    @endif
+                    <x-validation-error-message field="password" />
                 </div>
 
                 <div class="mt-3 mb-3">
                     <label for="password_confirmation" class="form-label">Confirm password</label>
-                    <input type="password" name="password_confirmation" class="form-control @if($errors !== null && array_key_exists('password_confirmation', $errors)) is-invalid @endif" id="password_confirmation" aria-describedby="password_confirmation-help" required value="{{ old('password_confirmation') }}" />
+                    <input type="password" name="password_confirmation" class="form-control <x-validation-error field='password_confirmation' />" id="password_confirmation" aria-describedby="password_confirmation-help" required value="{{ old('password_confirmation') }}" />
                     <div id="password_confirmation-help" class="form-text">Please enter your password again</div>
-                    @if($errors !== null && array_key_exists('password_confirmation', $errors))
-                        <div class="invalid-feedback">
-                            @foreach ($errors['password_confirmation'] as $error)
-                                {{ $error }}
-                            @endforeach
-                        </div>
-                    @endif
+                    <x-validation-error-message field="password_confirmation" />
                 </div>
-                <input type="hidden" name="token" value="{{ old('token', $token) }}" />
+                <input type="hidden" name="encrypted_token" value="{{ old('encrypted_token', $encrypted_token) }}" />
                 <input type="hidden" name="email" value="{{ old('email', $email) }}" />
                 <button type="submit" class="btn btn-primary w-100" title="Set your password">Set Password</button>
             </form>
diff --git a/resources/views/authentication/create-password.blade.php b/resources/views/authentication/create-password.blade.php
index bb8ce5c..983063a 100644
--- a/resources/views/authentication/create-password.blade.php
+++ b/resources/views/authentication/create-password.blade.php
@@ -81,28 +81,16 @@
 
                 <div class="mt-3 mb-3">
                     <label for="password" class="form-label">Password</label>
-                    <input type="password" name="password" class="form-control @if($errors !== null && array_key_exists('password', $errors)) is-invalid @endif" id="password" aria-describedby="password-help" required value="{{ old('password') }}" />
+                    <input type="password" name="password" class="form-control <x-validation-error field='password' />" id="password" aria-describedby="password-help" required value="{{ old('password') }}" />
                     <div id="password-help" class="form-text">Please enter a password, at least 12 characters please, <em>your password will be hashed</em>.</div>
-                    @if($errors !== null && array_key_exists('password', $errors))
-                        <div class="invalid-feedback">
-                            @foreach ($errors['password'] as $error)
-                                {{ $error }}
-                            @endforeach
-                        </div>
-                    @endif
+                    <x-validation-error-message field="password" />
                 </div>
 
                 <div class="mt-3 mb-3">
                     <label for="password_confirmation" class="form-label">Confirm password</label>
-                    <input type="password" name="password_confirmation" class="form-control @if($errors !== null && array_key_exists('password_confirmation', $errors)) is-invalid @endif" id="password_confirmation" aria-describedby="password_confirmation-help" required value="{{ old('password_confirmation') }}" />
+                    <input type="password" name="password_confirmation" class="form-control <x-validation-error field='password_confirmation' />" id="password_confirmation" aria-describedby="password_confirmation-help" required value="{{ old('password_confirmation') }}" />
                     <div id="password_confirmation-help" class="form-text">Please enter your password again</div>
-                    @if($errors !== null && array_key_exists('password_confirmation', $errors))
-                        <div class="invalid-feedback">
-                            @foreach ($errors['password_confirmation'] as $error)
-                                {{ $error }}
-                            @endforeach
-                        </div>
-                    @endif
+                    <x-validation-error-message field="password_confirmation" />
                 </div>
                 <input type="hidden" name="token" value="{{ old('token', $token) }}" />
                 <input type="hidden" name="email" value="{{ old('email', $email) }}" />
diff --git a/resources/views/authentication/forgot-password.blade.php b/resources/views/authentication/forgot-password.blade.php
index a0bf196..e76183b 100644
--- a/resources/views/authentication/forgot-password.blade.php
+++ b/resources/views/authentication/forgot-password.blade.php
@@ -82,16 +82,10 @@
 
                 <div class="mt-3 mb-3">
                     <label for="email" class="form-label">Email</label>
-                    <input type="email" name="email" class="form-control @if($errors !== null && array_key_exists('email', $errors)) is-invalid @endif" id="email" aria-describedby="email-help" required value="{{ old('email') }}" />
+                    <input type="email" name="email" class="form-control <x-validation-error field='email' />" id="email" aria-describedby="email-help" required value="{{ old('email') }}" />
                     <div id="email-help" class="form-text">Please enter your email address, <em>we will never share
                             your email address</em>.</div>
-                    @if($errors !== null && array_key_exists('email', $errors))
-                        <div class="invalid-feedback">
-                            @foreach ($errors['email'] as $error)
-                                {{ $error }}
-                            @endforeach
-                        </div>
-                    @endif
+                    <x-validation-error-message field="email" />
                 </div>
 
                 <div class="mb-3">
diff --git a/resources/views/authentication/register.blade.php b/resources/views/authentication/register.blade.php
index 6664a96..dd62dbe 100644
--- a/resources/views/authentication/register.blade.php
+++ b/resources/views/authentication/register.blade.php
@@ -83,29 +83,17 @@
 
                     <div class="mt-3 mb-3">
                         <label for="name" class="form-label">Name</label>
-                        <input type="text" name="name" class="form-control @if($errors !== null && array_key_exists('name', $errors)) is-invalid @endif" id="name" aria-describedby="name-help" required value="{{ old('name') }}" />
+                        <input type="text" name="name" class="form-control <x-validation-error field='name' />" id="name" aria-describedby="name-help" required value="{{ old('name') }}" />
                         <div id="name-help" class="form-text">Please enter a name, <em>any name will do</em>.</div>
-                        @if($errors !== null && array_key_exists('name', $errors))
-                            <div class="invalid-feedback">
-                                @foreach ($errors['name'] as $error)
-                                    {{ $error }}
-                                @endforeach
-                            </div>
-                        @endif
+                        <x-validation-error-message field="name" />
                     </div>
 
                     <div class="mt-3 mb-3">
                         <label for="email" class="form-label">Email</label>
-                        <input type="email" name="email" class="form-control @if($errors !== null && array_key_exists('email', $errors)) is-invalid @endif" id="email" aria-describedby="email-help" required value="{{ old('email') }}" />
+                        <input type="email" name="email" class="form-control <x-validation-error field='email' />" id="email" aria-describedby="email-help" required value="{{ old('email') }}" />
                         <div id="email-help" class="form-text">Please enter your email address, <em>we will never share
                                 your email address</em>.</div>
-                        @if($errors !== null && array_key_exists('email', $errors))
-                            <div class="invalid-feedback">
-                                @foreach ($errors['email'] as $error)
-                                    {{ $error }}
-                                @endforeach
-                            </div>
-                        @endif
+                        <x-validation-error-message field="email" />
                     </div>
 
                     <div class="mb-3">
diff --git a/resources/views/authentication/sign-in.blade.php b/resources/views/authentication/sign-in.blade.php
index 1598907..43e703f 100644
--- a/resources/views/authentication/sign-in.blade.php
+++ b/resources/views/authentication/sign-in.blade.php
@@ -75,32 +75,20 @@
 
                 <div class="mt-3 mb-3">
                     <label for="email" class="form-label">Email</label>
-                    <input type="email" name="email" class="form-control @if($errors !== null && array_key_exists('email', $errors)) is-invalid @endif" id="email" aria-describedby="email-help" required value="{{ old('email') }}" />
+                    <input type="email" name="email" class="form-control <x-validation-error field='email' />" id="email" aria-describedby="email-help" required value="{{ old('email') }}" />
                     <div id="email-help" class="form-text">Please enter your email address, <em>we will never share
                             your email address</em>.</div>
-                    @if($errors !== null && array_key_exists('email', $errors))
-                        <div class="invalid-feedback">
-                            @foreach ($errors['email'] as $error)
-                                {{ $error }}
-                            @endforeach
-                        </div>
-                    @endif
+                    <x-validation-error-message field="email" />
                 </div>
                 <div class="mb-3">
                     <label for="password" class="form-label">Password</label>
-                    <input type="password" name="password" class="form-control @if($errors !== null && array_key_exists('password', $errors)) is-invalid @endif" id="password" aria-describedby="password-help" required value="" />
+                    <input type="password" name="password" class="form-control <x-validation-error field='password' />" id="password" aria-describedby="password-help" required value="{{ old('password') }}" />
                     <div id="password-help" class="form-text">Please enter your password, <em>we will check this
                             against the hashed value in our database</em>.</div>
-                    @if($errors !== null && array_key_exists('password', $errors))
-                        <div class="invalid-feedback">
-                            @foreach ($errors['password'] as $error)
-                                {{ $error }}
-                            @endforeach
-                        </div>
-                    @endif
+                    <x-validation-error-message field="password" />
                 </div>
                 <div class="mb-3 form-check">
-                    <input type="checkbox" class="form-check-input" id="remember_me">
+                    <input type="checkbox" class="form-check-input" name="remember_me" id="remember_me">
                     <label class="form-check-label" for="remember_me">Check to stay signed-in for longer</label>
                 </div>
 
diff --git a/routes/web.php b/routes/web.php
index 1314c37..08c4de7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -50,9 +50,9 @@
     [Authentication::class, 'createNewPasswordProcess']
 )->name('create-new-password.process');
 
-Route::get(
+Route::view(
     '/new-password-created',
-    [Authentication::class, 'newPasswordCreated']
+    'authentication.new-password-created',
 )->name('new-password-created');
 
 Route::get(
@@ -65,9 +65,9 @@
     [Authentication::class, 'forgotPasswordProcess']
 )->name('forgot-password.process');
 
-Route::get(
+Route::view(
     '/forgot-password-email-issued',
-    [Authentication::class, 'forgotPasswordEmailIssued']
+    'authentication.forgot-password-email-issued',
 )->name('forgot-password-email-issued');
 
 Route::post(
@@ -75,9 +75,9 @@
     [Authentication::class, 'createPasswordProcess']
 )->name('create-password.process');
 
-Route::get(
+Route::view(
     '/registration-complete',
-    [Authentication::class, 'registrationComplete']
+    'authentication.registration-complete'
 )->name('registration-complete');