diff --git a/resources/views/portal/ninja2020/auth/includes/register/personal_address.blade.php b/resources/views/portal/ninja2020/auth/includes/register/personal_address.blade.php
new file mode 100644
index 000000000000..abfe0ebd5576
--- /dev/null
+++ b/resources/views/portal/ninja2020/auth/includes/register/personal_address.blade.php
@@ -0,0 +1,73 @@
+<!-- Client personal address -->
+<h3 class="text-lg font-medium leading-6 text-gray-900 mt-8">{{ ctrans('texts.personal_address') }}</h3>
+
+<p class="mt-1 text-sm leading-5 text-gray-500">
+    {{ ctrans('texts.enter_your_personal_address') }}
+</p>
+
+<div class="shadow overflow-hidden rounded mt-4">
+    <div class="px-4 py-5 bg-white sm:p-6">
+        <div class="grid grid-cols-6 gap-6">
+            <div class="col-span-6 sm:col-span-4">
+                <label for="address1" class="input-label">{{ ctrans('texts.address1') }}</label>
+                <input id="address1" class="input w-full" name="address1" />
+                @error('address1')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                @enderror
+            </div>
+            <div class="col-span-6 sm:col-span-3">
+                <label for="address2" class="input-label">{{ ctrans('texts.address2') }}</label>
+                <input id="address2" class="input w-full" name="address2" />
+                @error('address2')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                @enderror
+            </div>
+            <div class="col-span-6 sm:col-span-3">
+                <label for="city" class="input-label">{{ ctrans('texts.city') }}</label>
+                <input id="city" class="input w-full" name="city" />
+                @error('city')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                @enderror
+            </div>
+            <div class="col-span-6 sm:col-span-2">
+                <label for="state" class="input-label">{{ ctrans('texts.state') }}</label>
+                <input id="state" class="input w-full" name="state" />
+                @error('state')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                @enderror
+            </div>
+            <div class="col-span-6 sm:col-span-2">
+                <label for="postal_code" class="input-label">{{ ctrans('texts.postal_code') }}</label>
+                <input id="postal_code" class="input w-full" name="postal_code" />
+                @error('postal_code')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                @enderror
+            </div>
+            <div class="col-span-6 sm:col-span-2">
+                <label for="country" class="input-label">{{ ctrans('texts.country') }}</label>
+                <select id="country" class="input w-full form-select" name="country">
+                    @foreach(App\Utils\TranslationHelper::getCountries() as $country)
+                        <option value="{{ $country->id }}">
+                            {{ $country->iso_3166_2 }} ({{ $country->name }})
+                        </option>
+                    @endforeach
+                </select>
+                @error('country')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                @enderror
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/auth/includes/register/personal_information.blade.php b/resources/views/portal/ninja2020/auth/includes/register/personal_information.blade.php
new file mode 100644
index 000000000000..662c103e0fe5
--- /dev/null
+++ b/resources/views/portal/ninja2020/auth/includes/register/personal_information.blade.php
@@ -0,0 +1,90 @@
+<!-- Personal info, first name, last name, e-mail address .. -->
+<h3 class="text-lg font-medium leading-6 text-gray-900 mt-8">{{ ctrans('texts.profile') }}</h3>
+
+<p class="mt-1 text-sm leading-5 text-gray-500">
+    {{ ctrans('texts.client_information_text') }}
+</p>
+
+<div class="shadow overflow-hidden rounded mt-4">
+    <div class="px-4 py-5 bg-white sm:p-6">
+        <div class="grid grid-cols-6 gap-6">
+            <div class="col-span-6 sm:col-span-3">
+                <section class="flex items-center">
+                    <label for="first_name" class="input-label">{{ ctrans('texts.first_name') }}</label>
+                    <section class="text-red-400 ml-1 text-sm">*</section>
+                </section>
+                <input id="first_name" class="input w-full" name="first_name" />
+                @error('first_name')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                @enderror
+            </div>
+
+            <div class="col-span-6 sm:col-span-3">
+                <section class="flex items-center">
+                    <label for="last_name" class="input-label">{{ ctrans('texts.last_name') }}</label>
+                    <section class="text-red-400 ml-1 text-sm">*</section>
+                </section>
+                <input id="last_name" class="input w-full" name="last_name" />
+                @error('last_name')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                @enderror
+            </div>
+
+            <div class="col-span-6 sm:col-span-4">
+                <section class="flex items-center">
+                    <label for="email_address" class="input-label">{{ ctrans('texts.email_address') }}</label>
+                    <section class="text-red-400 ml-1 text-sm">*</section>
+                </section>
+                <input id="email_address" class="input w-full" type="email" name="email" />
+                @error('email')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                @enderror
+            </div>
+
+            <div class="col-span-6 sm:col-span-4">
+                <section class="flex items-center">
+                    <label for="phone" class="input-label">{{ ctrans('texts.phone') }}</label>
+                    <section class="text-red-400 ml-1 text-sm">*</section>
+                </section>
+                <input id="phone" class="input w-full" name="phone" />
+                @error('phone')
+                <div class="validation validation-fail">
+                    {{ $message }}
+                </div>
+                @enderror
+            </div>
+
+            <div class="col-span-6 sm:col-span-6 lg:col-span-3">
+                <section class="flex items-center">
+                    <label for="password" class="input-label">{{ ctrans('texts.password') }}</label>
+                    <section class="text-red-400 ml-1 text-sm">*</section>
+                </section>
+                <input id="password" class="input w-full" name="password" type="password" />
+                @error('password')
+                <div class="validation validation-fail">
+                    {{ $message }}
+                </div>
+                @enderror
+            </div>
+
+            <div class="col-span-6 sm:col-span-3 lg:col-span-3">
+                <section class="flex items-center">
+                    <label for="password_confirmation" class="input-label">{{ ctrans('texts.confirm_password') }}</label>
+                    <section class="text-red-400 ml-1 text-sm">*</section>
+                </section>
+                <input id="state" class="input w-full" name="password_confirmation" type="password" />
+                @error('password_confirmation')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                @enderror
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/auth/includes/register/shipping_address.blade.php b/resources/views/portal/ninja2020/auth/includes/register/shipping_address.blade.php
new file mode 100644
index 000000000000..72972a81de63
--- /dev/null
+++ b/resources/views/portal/ninja2020/auth/includes/register/shipping_address.blade.php
@@ -0,0 +1,74 @@
+ <!-- Client shipping address -->
+ <h3 class="text-lg font-medium leading-6 text-gray-900 mt-8">{{ ctrans('texts.shipping_address') }}</h3>
+
+ <p class="mt-1 text-sm leading-5 text-gray-500">
+     {{ ctrans('texts.enter_your_shipping_address') }}
+ </p>
+
+ <div class="shadow overflow-hidden rounded mt-4">
+     <div class="px-4 py-5 bg-white sm:p-6">
+         <div class="grid grid-cols-6 gap-6">
+             <div class="col-span-6 sm:col-span-4">
+                 <label for="shipping_address1" class="input-label">{{ ctrans('texts.shipping_address1') }}</label>
+                 <input id="shipping_address1" class="input w-full" name="shipping_address1" />
+                 @error('shipping_address1')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                 @enderror
+             </div>
+             <div class="col-span-6 sm:col-span-3">
+                 <label for="shipping_address2" class="input-label">{{ ctrans('texts.shipping_address2') }}</label>
+                 <input id="shipping_address2" class="input w-full" name="shipping_address2" />
+                 @error('shipping_address2')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                 @enderror
+             </div>
+             <div class="col-span-6 sm:col-span-3">
+                 <label for="shipping_city" class="input-label">{{ ctrans('texts.shipping_city') }}</label>
+                 <input id="shipping_city" class="input w-full" name="shipping_city" />
+                 @error('shipping_city')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                 @enderror
+             </div>
+             <div class="col-span-6 sm:col-span-2">
+                 <label for="shipping_state" class="input-label">{{ ctrans('texts.shipping_state') }}</label>
+                 <input id="shipping_state" class="input w-full" name="shipping_state" />
+                 @error('shipping_state')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                 @enderror
+             </div>
+             <div class="col-span-6 sm:col-span-2">
+                 <label for="shipping_postal_code" class="input-label">{{ ctrans('texts.shipping_postal_code') }}</label>
+                 <input id="shipping_postal_code" class="input w-full" name="shipping_postal_code" />
+                 @error('shipping_postal_code')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                 @enderror
+             </div>
+             <div class="col-span-4 sm:col-span-2">
+                 <label for="shipping_country" class="input-label">{{ ctrans('texts.shipping_country') }}</label>
+                 <select id="shipping_country" class="input w-full form-select" name="shipping_country">
+                     @foreach(App\Utils\TranslationHelper::getCountries() as $country)
+                        <option {{ $country == isset(auth()->user()->client->shipping_country->id) ? 'selected' : null }} value="{{ $country->id }}">
+                            {{ $country->iso_3166_2 }}
+                            ({{ $country->name }})
+                        </option>
+                     @endforeach
+                 </select>
+                 @error('country')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                 @enderror
+             </div>
+         </div>
+     </div>
+ </div>
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/auth/includes/register/website.blade.php b/resources/views/portal/ninja2020/auth/includes/register/website.blade.php
new file mode 100644
index 000000000000..fda7c1a08634
--- /dev/null
+++ b/resources/views/portal/ninja2020/auth/includes/register/website.blade.php
@@ -0,0 +1,32 @@
+<!-- Name, website -->
+<h3 class="text-lg font-medium leading-6 text-gray-900 mt-8">{{ ctrans('texts.website') }}</h3>
+
+<p class="mt-1 text-sm leading-5 text-gray-500">
+    {{ ctrans('texts.make_sure_use_full_link') }}
+</p>
+
+<div class="shadow overflow-hidden rounded mt-4">
+    <div class="px-4 py-5 bg-white sm:p-6">
+        <div class="grid grid-cols-6 gap-6">
+            <div class="col-span-6 sm:col-span-3">
+                <label for="street" class="input-label">{{ ctrans('texts.name') }}</label>
+                <input id="name" class="input w-full" name="name" />
+                @error('name')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                @enderror
+            </div>
+
+            <div class="col-span-6 sm:col-span-3">
+                <label for="website" class="input-label">{{ ctrans('texts.website') }}</label>
+                <input id="website" class="input w-full" name="last_name" />
+                @error('website')
+                    <div class="validation validation-fail">
+                        {{ $message }}
+                    </div>
+                @enderror
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/auth/register.blade.php b/resources/views/portal/ninja2020/auth/register.blade.php
index f0afdd8f9412..a5045a93d8db 100644
--- a/resources/views/portal/ninja2020/auth/register.blade.php
+++ b/resources/views/portal/ninja2020/auth/register.blade.php
@@ -2,297 +2,39 @@
 @section('meta_title', ctrans('texts.register'))
 
 @section('body')
-<div class="grid lg:grid-cols-12 py-8" x-data="{ more: false }">
-    <div class="col-span-4 col-start-5">
-        <div class="flex justify-center">
-            <img class="h-32 w-auto" src="{{ $company->present()->logo() }}" alt="{{ ctrans('texts.logo') }}">
-        </div>
-        <h1 class="text-center text-3xl mt-8">{{ ctrans('texts.register') }}</h1>
-        <p class="block text-center text-gray-600">{{ ctrans('texts.register_label') }}</p>
-
-        <form action="{{ route('client.register', request()->route('company_key')) }}" method="post">
-            @csrf
-
-            <!-- Personal info, first name, last name, e-mail address .. -->
-            <h3 class="text-lg font-medium leading-6 text-gray-900 mt-8">{{ ctrans('texts.profile') }}</h3>
-            <p class="mt-1 text-sm leading-5 text-gray-500">
-                {{ ctrans('texts.client_information_text') }}
-            </p>
-            <div class="shadow overflow-hidden rounded mt-4">
-                <div class="px-4 py-5 bg-white sm:p-6">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <section class="flex items-center">
-                                <label for="first_name" class="input-label">{{ ctrans('texts.first_name') }}</label>
-                                <section class="text-red-400 ml-1 text-sm">*</section>
-                            </section>
-                            <input id="first_name" class="input w-full" name="first_name" />
-                            @error('first_name')
-                            <div class="validation validation-fail">
-                                {{ $message }}
-                            </div>
-                            @enderror
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <section class="flex items-center">
-                                <label for="last_name" class="input-label">{{ ctrans('texts.last_name') }}</label>
-                                <section class="text-red-400 ml-1 text-sm">*</section>
-                            </section>
-                            <input id="last_name" class="input w-full" name="last_name" />
-                            @error('last_name')
-                            <div class="validation validation-fail">
-                                {{ $message }}
-                            </div>
-                            @enderror
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-4">
-                            <section class="flex items-center">
-                                <label for="email_address" class="input-label">{{ ctrans('texts.email_address') }}</label>
-                                <section class="text-red-400 ml-1 text-sm">*</section>
-                            </section>
-                            <input id="email_address" class="input w-full" type="email" name="email" />
-                            @error('email')
-                            <div class="validation validation-fail">
-                                {{ $message }}
-                            </div>
-                            @enderror
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-4">
-                            <section class="flex items-center">
-                                <label for="phone" class="input-label">{{ ctrans('texts.phone') }}</label>
-                                <section class="text-red-400 ml-1 text-sm">*</section>
-                            </section>
-                            <input id="phone" class="input w-full" name="phone" />
-                            @error('phone')
-                            <div class="validation validation-fail">
-                                {{ $message }}
-                            </div>
-                            @enderror
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-6 lg:col-span-3">
-                            <section class="flex items-center">
-                                <label for="password" class="input-label">{{ ctrans('texts.password') }}</label>
-                                <section class="text-red-400 ml-1 text-sm">*</section>
-                            </section>
-                            <input id="password" class="input w-full" name="password" type="password" />
-                            @error('password')
-                            <div class="validation validation-fail">
-                                {{ $message }}
-                            </div>
-                            @enderror
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3 lg:col-span-3">
-                            <section class="flex items-center">
-                                <label for="password_confirmation" class="input-label">{{ ctrans('texts.confirm_password') }}</label>
-                                <section class="text-red-400 ml-1 text-sm">*</section>
-                            </section>
-                            <input id="state" class="input w-full" name="password_confirmation" type="password" />
-                            @error('password_confirmation')
-                            <div class="validation validation-fail">
-                                {{ $message }}
-                            </div>
-                            @enderror
-                        </div>
-                    </div>
-                </div>
+    <div class="grid lg:grid-cols-12 py-8" x-data="{ more: false }">
+        <div class="col-span-4 col-start-5">
+            <div class="flex justify-center">
+                <img class="h-32 w-auto" src="{{ $company->present()->logo() }}" alt="{{ ctrans('texts.logo') }}">
             </div>
+            <h1 class="text-center text-3xl mt-8">{{ ctrans('texts.register') }}</h1>
+            <p class="block text-center text-gray-600">{{ ctrans('texts.register_label') }}</p>
 
-            <span class="block mt-4 text-gray-800 hover:text-gray-900 text-right cursor-pointer" x-on:click="more = !more">{{ ctrans('texts.more_fields') }}</span>
+            <form action="{{ route('client.register', request()->route('company_key')) }}" method="post">
+                @csrf
+                @include('portal.ninja2020.auth.includes.register.personal_information')
 
-            <div x-show="more">
-                <!-- Name, website -->
-                <h3 class="text-lg font-medium leading-6 text-gray-900 mt-8">{{ ctrans('texts.website') }}</h3>
-                <p class="mt-1 text-sm leading-5 text-gray-500">
-                    {{ ctrans('texts.make_sure_use_full_link') }}
-                </p>
-                <div class="shadow overflow-hidden rounded mt-4">
-                    <div class="px-4 py-5 bg-white sm:p-6">
-                        <div class="grid grid-cols-6 gap-6">
-                            <div class="col-span-6 sm:col-span-3">
-                                <label for="street" class="input-label">@lang('texts.name')</label>
-                                <input id="name" class="input w-full" name="name" />
-                                @error('name')
-                                <div class="validation validation-fail">
-                                    {{ $message }}
-                                </div>
-                                @enderror
-                            </div>
-                            <div class="col-span-6 sm:col-span-3">
-                                <label for="website" class="input-label">@lang('texts.website')</label>
-                                <input id="website" class="input w-full" name="last_name" />
-                                @error('website')
-                                <div class="validation validation-fail">
-                                    {{ $message }}
-                                </div>
-                                @enderror
-                            </div>
-                        </div>
-                    </div>
+                <span class="block mt-4 text-gray-800 hover:text-gray-900 text-right cursor-pointer" x-on:click="more = !more">{{ ctrans('texts.more_fields') }}</span>
+
+                <div x-show="more">
+                    @include('portal.ninja2020.auth.includes.register.website')
+                    @include('portal.ninja2020.auth.includes.register.personal_address')
+                    @include('portal.ninja2020.auth.includes.register.shipping_address')
                 </div>
 
-                <!-- Client personal address -->
-                <h3 class="text-lg font-medium leading-6 text-gray-900 mt-8">{{ ctrans('texts.personal_address') }}</h3>
-                <p class="mt-1 text-sm leading-5 text-gray-500">
-                    {{ ctrans('texts.enter_your_personal_address') }}
-                </p>
-                <div class="shadow overflow-hidden rounded mt-4">
-                    <div class="px-4 py-5 bg-white sm:p-6">
-                        <div class="grid grid-cols-6 gap-6">
-                            <div class="col-span-6 sm:col-span-4">
-                                <label for="address1" class="input-label">@lang('texts.address1')</label>
-                                <input id="address1" class="input w-full" name="address1" />
-                                @error('address1')
-                                <div class="validation validation-fail">
-                                    {{ $message }}
-                                </div>
-                                @enderror
-                            </div>
-                            <div class="col-span-6 sm:col-span-3">
-                                <label for="address2" class="input-label">@lang('texts.address2')</label>
-                                <input id="address2" class="input w-full" name="address2" />
-                                @error('address2')
-                                <div class="validation validation-fail">
-                                    {{ $message }}
-                                </div>
-                                @enderror
-                            </div>
-                            <div class="col-span-6 sm:col-span-3">
-                                <label for="city" class="input-label">@lang('texts.city')</label>
-                                <input id="city" class="input w-full" name="city" />
-                                @error('city')
-                                <div class="validation validation-fail">
-                                    {{ $message }}
-                                </div>
-                                @enderror
-                            </div>
-                            <div class="col-span-6 sm:col-span-2">
-                                <label for="state" class="input-label">@lang('texts.state')</label>
-                                <input id="state" class="input w-full" name="state" />
-                                @error('state')
-                                <div class="validation validation-fail">
-                                    {{ $message }}
-                                </div>
-                                @enderror
-                            </div>
-                            <div class="col-span-6 sm:col-span-2">
-                                <label for="postal_code" class="input-label">@lang('texts.postal_code')</label>
-                                <input id="postal_code" class="input w-full" name="postal_code" />
-                                @error('postal_code')
-                                <div class="validation validation-fail">
-                                    {{ $message }}
-                                </div>
-                                @enderror
-                            </div>
-                            <div class="col-span-6 sm:col-span-2">
-                                <label for="country" class="input-label">@lang('texts.country')</label>
-                                <select id="country" class="input w-full form-select" name="country">
-                                    @foreach(App\Utils\TranslationHelper::getCountries() as $country)
-                                    <option value="{{ $country->id }}">
-                                        {{ $country->iso_3166_2 }} ({{ $country->name }})
-                                    </option>
-                                    @endforeach
-                                </select>
-                                @error('country')
-                                <div class="validation validation-fail">
-                                    {{ $message }}
-                                </div>
-                                @enderror
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Client shipping address -->
-                <h3 class="text-lg font-medium leading-6 text-gray-900 mt-8">{{ ctrans('texts.shipping_address') }}</h3>
-                <p class="mt-1 text-sm leading-5 text-gray-500">
-                    {{ ctrans('texts.enter_your_shipping_address') }}
-                </p>
-                <div class="shadow overflow-hidden rounded mt-4">
-                    <div class="px-4 py-5 bg-white sm:p-6">
-                        <div class="grid grid-cols-6 gap-6">
-                            <div class="col-span-6 sm:col-span-4">
-                                <label for="shipping_address1" class="input-label">@lang('texts.shipping_address1')</label>
-                                <input id="shipping_address1" class="input w-full" name="shipping_address1" />
-                                @error('shipping_address1')
-                                <div class="validation validation-fail">
-                                    {{ $message }}
-                                </div>
-                                @enderror
-                            </div>
-                            <div class="col-span-6 sm:col-span-3">
-                                <label for="shipping_address2" class="input-label">@lang('texts.shipping_address2')</label>
-                                <input id="shipping_address2" class="input w-full" name="shipping_address2" />
-                                @error('shipping_address2')
-                                <div class="validation validation-fail">
-                                    {{ $message }}
-                                </div>
-                                @enderror
-                            </div>
-                            <div class="col-span-6 sm:col-span-3">
-                                <label for="shipping_city" class="input-label">@lang('texts.shipping_city')</label>
-                                <input id="shipping_city" class="input w-full" name="shipping_city" />
-                                @error('shipping_city')
-                                <div class="validation validation-fail">
-                                    {{ $message }}
-                                </div>
-                                @enderror
-                            </div>
-                            <div class="col-span-6 sm:col-span-2">
-                                <label for="shipping_state" class="input-label">@lang('texts.shipping_state')</label>
-                                <input id="shipping_state" class="input w-full" name="shipping_state" />
-                                @error('shipping_state')
-                                <div class="validation validation-fail">
-                                    {{ $message }}
-                                </div>
-                                @enderror
-                            </div>
-                            <div class="col-span-6 sm:col-span-2">
-                                <label for="shipping_postal_code" class="input-label">@lang('texts.shipping_postal_code')</label>
-                                <input id="shipping_postal_code" class="input w-full" name="shipping_postal_code" />
-                                @error('shipping_postal_code')
-                                <div class="validation validation-fail">
-                                    {{ $message }}
-                                </div>
-                                @enderror
-                            </div>
-                            <div class="col-span-4 sm:col-span-2">
-                                <label for="shipping_country" class="input-label">@lang('texts.shipping_country')</label>
-                                <select id="shipping_country" class="input w-full form-select" name="shipping_country">
-                                    @foreach(App\Utils\TranslationHelper::getCountries() as $country)
-                                    <option {{ $country == isset(auth()->user()->client->shipping_country->id) ? 'selected' : null }} value="{{ $country->id }}">
-                                        {{ $country->iso_3166_2 }}
-                                        ({{ $country->name }})
-                                    </option>
-                                    @endforeach
-                                </select>
-                                @error('country')
-                                <div class="validation validation-fail">
-                                    {{ $message }}
-                                </div>
-                                @enderror
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="flex justify-between items-center mt-8">
-                <span class="inline-flex items-center">
-                    <input type="checkbox" name="terms" class="form-checkbox mr-2 cursor-pointer" checked>
-                    <span class="text-sm text-gray-800">
-                        {{ ctrans('texts.i_agree') }} <a class="button-link" href="https://www.invoiceninja.com/self-hosting-terms-service/">{{ ctrans('texts.terms_of_service') }}</a> and <a class="button-link" href="https://www.invoiceninja.com/self-hosting-privacy-data-control/">{{ ctrans('texts.privacy_policy') }}</a>
+                <div class="flex justify-between items-center mt-8">
+                    <span class="inline-flex items-center">
+                        <input type="checkbox" name="terms" class="form-checkbox mr-2 cursor-pointer" checked>
+                        <span class="text-sm text-gray-800">
+                            {{ ctrans('texts.i_agree') }} <a class="button-link" href="https://www.invoiceninja.com/self-hosting-terms-service/">{{ ctrans('texts.terms_of_service') }}</a> and <a class="button-link" href="https://www.invoiceninja.com/self-hosting-privacy-data-control/">{{ ctrans('texts.privacy_policy') }}</a>
+                        </span>
                     </span>
-                </span>
-                <button class="button button-primary">
-                    @lang('texts.save')
-                </button>
-            </div>
-        </form>
+
+                    <button class="button button-primary">
+                        @lang('texts.save')
+                    </button>
+                </div>
+            </form>
+        </div>
     </div>
-</div>
 @endsection
\ No newline at end of file