diff --git a/app/Http/Requests/ClientPortal/RegisterRequest.php b/app/Http/Requests/ClientPortal/RegisterRequest.php
index 2286e31ea736..8b54ccc5488d 100644
--- a/app/Http/Requests/ClientPortal/RegisterRequest.php
+++ b/app/Http/Requests/ClientPortal/RegisterRequest.php
@@ -25,15 +25,25 @@ class RegisterRequest extends FormRequest
      *
      * @return array
      */
-    public function rules()
+    public function rules(): array
     {
-        $rules = [
-            'first_name' => ['required', 'string', 'max:255'],
-            'last_name' => ['required', 'string', 'max:255'],
-            'phone' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'string', 'email:rfc,dns', 'max:255'],
-            'password' => ['required', 'string', 'min:6', 'confirmed'],
-        ];
+        $rules = [];
+
+        foreach ($this->company()->client_registration_fields as $field) {
+            if ($field['required']) {
+                $rules[$field['key']] = ['required'];
+            }
+        }
+
+        foreach ($rules as $field => $properties) {
+            if ($field === 'email') {
+                $rules[$field] = array_merge($rules[$field], ['email:rfc,dns', 'max:255']);
+            }
+
+            if ($field === 'password') {
+                $rules[$field] = array_merge($rules[$field], ['string', 'min:6', 'confirmed']);
+            }
+        }
 
         if ($this->company()->settings->client_portal_terms || $this->company()->settings->client_portal_privacy_policy) {
             $rules['terms'] = ['required'];
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
deleted file mode 100644
index bdc4cf5343c0..000000000000
--- a/resources/views/portal/ninja2020/auth/includes/register/personal_address.blade.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- 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">
-                    <option value="none"></option>
-                    @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>
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
deleted file mode 100644
index 662c103e0fe5..000000000000
--- a/resources/views/portal/ninja2020/auth/includes/register/personal_information.blade.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<!-- 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
deleted file mode 100644
index 2d3109d61f3d..000000000000
--- a/resources/views/portal/ninja2020/auth/includes/register/shipping_address.blade.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<!-- 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 {{ in_array('shipping_address1', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}"
-                       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 {{ in_array('shipping_address2', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}"
-                    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 {{ in_array('shipping_city', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}"
-                       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-ful {{ in_array('shipping_state', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}l"
-                       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 {{ in_array('shipping_postal_code', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}"
-                       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 {{ in_array('shipping_country', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}"
-                        name="shipping_country">
-                    @foreach(App\Utils\TranslationHelper::getCountries() as $country)
-                        <option value="none"></option>
-                        <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>
diff --git a/resources/views/portal/ninja2020/auth/includes/register/website.blade.php b/resources/views/portal/ninja2020/auth/includes/register/website.blade.php
deleted file mode 100644
index 90341a61fa5a..000000000000
--- a/resources/views/portal/ninja2020/auth/includes/register/website.blade.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- 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="website" />
-                @error('website')
-                    <div class="validation validation-fail">
-                        {{ $message }}
-                    </div>
-                @enderror
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/resources/views/portal/ninja2020/auth/register.blade.php b/resources/views/portal/ninja2020/auth/register.blade.php
index cd4215f73ef3..7512c555a8fa 100644
--- a/resources/views/portal/ninja2020/auth/register.blade.php
+++ b/resources/views/portal/ninja2020/auth/register.blade.php
@@ -12,14 +12,90 @@
 
             <form action="{{ route('client.register', request()->route('company_key')) }}" method="POST" x-data="{ more: false }">
                 @csrf
-                @include('portal.ninja2020.auth.includes.register.personal_information')
 
-                <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 class="grid grid-cols-12 gap-4 mt-10">
+                    @foreach($company->client_registration_fields as $field)
+                        @if($field['required'])
+                            <div class="col-span-12 md:col-span-6">
+                                <section class="flex items-center">
+                                    <label 
+                                        for="{{ $field['key'] }}" 
+                                        class="input-label">
+                                        {{ ctrans("texts.{$field['key']}") }}
+                                    </label>
+                                    
+                                    @if($field['required'])
+                                        <section class="text-red-400 ml-1 text-sm">*</section>
+                                    @endif
+                                </section>
 
-                <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')
+                                @if($field['key'] === 'email')
+                                    <input 
+                                        id="{{ $field['key'] }}" 
+                                        class="input w-full" 
+                                        type="email"
+                                        name="{{ $field['key'] }}"
+                                        {{ $field['required'] ? 'required' : '' }} />
+                                @elseif($field['key'] === 'password')
+                                    <input 
+                                        id="{{ $field['key'] }}" 
+                                        class="input w-full" 
+                                        type="password"
+                                        name="{{ $field['key'] }}"
+                                        {{ $field['required'] ? 'required' : '' }} />
+                                @elseif($field['key'] === 'country_id')
+                                    <select 
+                                        id="shipping_country"
+                                        class="input w-full form-select"
+                                        name="shipping_country">
+                                            <option value="none"></option>
+                                        @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>
+                                @else
+                                    <input 
+                                        id="{{ $field['key'] }}" 
+                                        class="input w-full" 
+                                        name="{{ $field['key'] }}"
+                                        {{ $field['required'] ? 'required' : '' }} />
+                                @endif
+
+                                @error($field['key'])
+                                    <div class="validation validation-fail">
+                                        {{ $message }}
+                                    </div>
+                                @enderror
+                            </div>
+
+                            @if($field['key'] === 'password') 
+                                <div class="col-span-12 md:col-span-6">
+                                    <section class="flex items-center">
+                                        <label 
+                                            for="password_confirmation" 
+                                            class="input-label">
+                                            {{ ctrans('texts.password_confirmation') }}
+                                        </label>
+                                        
+                                        @if($field['required'])
+                                            <section class="text-red-400 ml-1 text-sm">*</section>
+                                        @endif
+                                    </section>
+
+                                    <input 
+                                        id="password_confirmation" 
+                                        type="password" 
+                                        class="input w-full" 
+                                        name="password_confirmation"
+                                        {{ $field['required'] ? 'required' : '' }} />
+                                </div>
+                            @endif
+                        @endif
+                    @endforeach
                 </div>
 
                 <div class="flex justify-between items-center mt-8">