diff --git a/js/src/forum/extendLogInModal.js b/js/src/forum/extendLogInModal.js
index 6397f86..2802730 100644
--- a/js/src/forum/extendLogInModal.js
+++ b/js/src/forum/extendLogInModal.js
@@ -16,13 +16,21 @@ export default function extendLogInModal() {
       items.add(
         'twoFactor',
         <div className="Form-group TwoFactorInput">
+          <legend>{app.translator.trans('ianm-twofactor.forum.log_in.two_factor_required_message')}</legend>
           <input
             className="FormControl"
             name="twoFactorToken"
             type="text"
             placeholder={app.translator.trans('ianm-twofactor.forum.log_in.two_factor_placeholder')}
-            bidi={this.twoFactorToken}
+            value={this.twoFactorToken()}
             disabled={this.loading}
+            oninput={(e) => {
+              this.twoFactorToken(e.currentTarget.value);
+
+              if (e.target.value.length === 6) {
+                this.onsubmit(new Event('submit')); // Trigger the onsubmit method
+              }
+            }}
           />
         </div>,
         19
@@ -41,18 +49,32 @@ export default function extendLogInModal() {
     return data;
   });
 
+  override(LogInModal.prototype, 'body', function (original) {
+    if (this.twoFactorRequired) {
+      return <div className="Form Form--centered">{this.fields().toArray()}</div>;
+    }
+
+    return original();
+  });
+
+  override(LogInModal.prototype, 'footer', function (original) {
+    if (this.twoFactorRequired) {
+      return null;
+    }
+
+    return original();
+  });
+
   override(LogInModal.prototype, 'onerror', function (original, error) {
-    if (error.status === 401) {
+    if (error.status === 422) {
       const errors = error.response && error.response.errors;
       const firstErrorDetail = (errors && errors[0] && errors[0].detail) || '';
 
       if (firstErrorDetail.includes('two_factor_required')) {
         // If the error indicates that 2FA is required, show the 2FA input field
         this.twoFactorRequired = true;
-        error.alert.content = app.translator.trans('ianm-twofactor.forum.log_in.two_factor_required_message');
-        this.alertAttrs = error.alert;
       } else {
-        // Handle other types of 401 errors here
+        // Handle other types of 422 errors here
         error.alert.content = app.translator.trans('core.forum.log_in.invalid_login_message');
         this.alertAttrs = error.alert;
       }
diff --git a/src/Api/Controller/CreateTwoFactorTokenController.php b/src/Api/Controller/CreateTwoFactorTokenController.php
index e18a990..6823da3 100644
--- a/src/Api/Controller/CreateTwoFactorTokenController.php
+++ b/src/Api/Controller/CreateTwoFactorTokenController.php
@@ -11,6 +11,7 @@
 
 namespace IanM\TwoFactor\Api\Controller;
 
+use Flarum\Foundation\ValidationException;
 use Flarum\Http\RememberAccessToken;
 use Flarum\Http\SessionAccessToken;
 use Flarum\User\Exception\NotAuthenticatedException;
@@ -29,17 +30,8 @@ class CreateTwoFactorTokenController implements RequestHandlerInterface
 {
     use TwoFactorAuthenticationTrait;
 
-    protected $users;
-    protected $bus;
-    protected $events;
-    protected $totp;
-
-    public function __construct(TotpInterface $totp, UserRepository $users, BusDispatcher $bus, EventDispatcher $events)
+    public function __construct(protected TotpInterface $totp, protected UserRepository $users, protected BusDispatcher $bus, protected EventDispatcher $events)
     {
-        $this->users = $users;
-        $this->bus = $bus;
-        $this->events = $events;
-        $this->totp = $totp;
     }
 
     public function handle(ServerRequestInterface $request): ResponseInterface
@@ -59,7 +51,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             $token = $this->retrieveTwoFactorTokenFrom(Arr::get($body, 'twoFactorToken'));
 
             if (! $this->isTokenActive($token, $user)) {
-                throw new NotAuthenticatedException('two_factor_required');
+                throw new ValidationException(['twoFactorToken' => 'two_factor_required']);
             }
         }