diff --git a/app/Http/Controllers/Auth/ContactRegisterController.php b/app/Http/Controllers/Auth/ContactRegisterController.php
index 0f6af81b6915..0ead02cb4b7f 100644
--- a/app/Http/Controllers/Auth/ContactRegisterController.php
+++ b/app/Http/Controllers/Auth/ContactRegisterController.php
@@ -21,7 +21,9 @@ class ContactRegisterController extends Controller
 
     public function showRegisterForm(string $company_key)
     {
-        return render('auth.register');
+        $company = Company::where('company_key', $company_key)->firstOrFail();
+
+        return render('auth.register', compact(['company']));
     }
 
     public function register(RegisterRequest $request)
diff --git a/resources/views/portal/ninja2020/auth/register.blade.php b/resources/views/portal/ninja2020/auth/register.blade.php
index d4bb6e31ee04..f0afdd8f9412 100644
--- a/resources/views/portal/ninja2020/auth/register.blade.php
+++ b/resources/views/portal/ninja2020/auth/register.blade.php
@@ -1,10 +1,13 @@
-@extends('portal.ninja2020.layout.clean')
+@extends('portal.ninja2020.layout.clean', ['custom_body_class' => 'bg-gray-100'])
 @section('meta_title', ctrans('texts.register'))
 
 @section('body')
-<div class="grid lg:grid-cols-12 bg-gray-100 py-8">
+<div class="grid lg:grid-cols-12 py-8" x-data="{ more: false }">
     <div class="col-span-4 col-start-5">
-        <h1 class="text-center text-3xl">{{ ctrans('texts.register') }}</h1>
+        <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">
@@ -99,176 +102,180 @@
                 </div>
             </div>
 
-            <!-- 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 }}
+            <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">
+                <!-- 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>
-                            @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 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>
-                            @enderror
                         </div>
                     </div>
                 </div>
-            </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 }}
+                <!-- 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>
-                            @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 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>
-                            @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 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>
-                            @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 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>
-                            @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 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>
-                            @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 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>
-                            @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 }}
+                <!-- 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>
-                            @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 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>
-                            @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 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>
-                            @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 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>
-                            @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 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>
-                            @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 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>
-                            @enderror
                         </div>
                     </div>
                 </div>
diff --git a/resources/views/portal/ninja2020/layout/clean.blade.php b/resources/views/portal/ninja2020/layout/clean.blade.php
index c9066d529ee3..e6862eacd91b 100644
--- a/resources/views/portal/ninja2020/layout/clean.blade.php
+++ b/resources/views/portal/ninja2020/layout/clean.blade.php
@@ -44,6 +44,7 @@
 
         <!-- Scripts -->
         <script src="{{ mix('js/app.js') }}" defer></script>
+        <script src="https://cdn.jsdelivr.net/gh/alpinejs/alpine@v2.x.x/dist/alpine.min.js" defer></script>
 
         <!-- Fonts -->
         <link rel="dns-prefetch" href="https://fonts.gstatic.com">
@@ -60,7 +61,7 @@
 
     </head>
 
-    <body class="antialiased">
+    <body class="antialiased {{ $custom_body_class ?? '' }}">
         @yield('body')
     </body>