diff --git a/flexiapi/app/Http/Controllers/Account/AccountController.php b/flexiapi/app/Http/Controllers/Account/AccountController.php
index 63890f2..d5103de 100644
--- a/flexiapi/app/Http/Controllers/Account/AccountController.php
+++ b/flexiapi/app/Http/Controllers/Account/AccountController.php
@@ -50,10 +50,10 @@ class AccountController extends Controller
 
     public function store(CreateAccountRequest $request)
     {
-        $account = (new AccountService(api: false))->store($request);
-
         $request->validate(['h-captcha-response' => captchaConfigured() ? 'required|HCaptcha' : '']);
 
+        $account = (new AccountService(api: false))->store($request);
+
         Auth::login($account);
 
         if ($request->has('phone')) {
diff --git a/flexiapi/resources/views/account/register/email.blade.php b/flexiapi/resources/views/account/register/email.blade.php
index 2eb74b1..383debd 100644
--- a/flexiapi/resources/views/account/register/email.blade.php
+++ b/flexiapi/resources/views/account/register/email.blade.php
@@ -10,7 +10,7 @@
         @include('parts.tabs.register')
 
         <form method="POST" action="{{ route('account.store') }}" accept-charset="UTF-8">
-@csrf
+        @csrf
 
         <div>
             <input placeholder="username" name="username" type="text" value="{{ old('username') }}" required>
@@ -34,12 +34,12 @@
         </div>
 
         <div>
-            <input required="" name="password" type="password" value="" placeholder="Password">
+            <input required="" name="password" type="password" value="{{ old('password') }}" placeholder="Password">
             <label for="password">Password</label>
             @include('parts.errors', ['name' => 'password'])
         </div>
         <div>
-            <input required="" name="password_confirmation" type="password" value="" placeholder="Password confirmation">
+            <input required="" name="password_confirmation" type="password" value="{{ old('password_confirmation') }}" placeholder="Password confirmation">
             <label for="password_confirmation">Confirm password</label>
             @include('parts.errors', ['name' => 'password_confirmation'])
         </div>
diff --git a/flexiapi/resources/views/admin/account/activity/index.blade.php b/flexiapi/resources/views/admin/account/activity/index.blade.php
index a428e2e..93c0c62 100644
--- a/flexiapi/resources/views/admin/account/activity/index.blade.php
+++ b/flexiapi/resources/views/admin/account/activity/index.blade.php
@@ -56,7 +56,7 @@
         <tbody>
             @foreach ($account->phoneChangeCodes as $phoneChangeCode)
                 <tr @if ($phoneChangeCode->consumed()) class="disabled crossed" @endif>
-                    <td>{{ $phoneChangeCode->phone }}<td>
+                    <td>{{ $phoneChangeCode->phone }}</td>
                     <td>
                         {{ $phoneChangeCode->created_at }}
                     </td>
diff --git a/flexiapi/resources/views/parts/captcha.blade.php b/flexiapi/resources/views/parts/captcha.blade.php
index 0ed977f..e30760e 100644
--- a/flexiapi/resources/views/parts/captcha.blade.php
+++ b/flexiapi/resources/views/parts/captcha.blade.php
@@ -1,6 +1,6 @@
 @if (captchaConfigured())
     <div class="large">
-        {!! HCaptcha::renderJs() !!}
+        <script src="https://hcaptcha.com/1/api.js?recaptchacompat=off" async="" defer=""></script>
         {!! HCaptcha::display() !!}
         @include('parts.errors', ['name' => 'h-captcha-response'])
     </div>