diff --git a/resources/views/portal/ninja2020/auth/includes/register/popup.blade.php b/resources/views/portal/ninja2020/auth/includes/register/popup.blade.php
new file mode 100644
index 000000000000..9585bfd0125e
--- /dev/null
+++ b/resources/views/portal/ninja2020/auth/includes/register/popup.blade.php
@@ -0,0 +1,30 @@
+<a class="button-link" x-on:click="{{ $property }} = true" href="#">{{ ctrans("texts.$property") }}</a>
+<span class="text-gray-300">/</span>
+
+<div x-show="{{ $property }}" class="fixed bottom-0 inset-x-0 px-4 pb-4 sm:inset-0 sm:flex sm:items-center sm:justify-center">
+    <div x-show="{{ $property }}" x-transition:enter="ease-out duration-300" x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-200" x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0" class="fixed inset-0 transition-opacity">
+        <div class="absolute inset-0 bg-gray-500 opacity-75"></div>
+    </div>
+
+    <div x-show="{{ $property }}" x-transition:enter="ease-out duration-300" x-transition:enter-start="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95" x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100" x-transition:leave="ease-in duration-200" x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100" x-transition:leave-end="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95" class="relative bg-white rounded-lg px-4 pt-5 pb-4 overflow-hidden shadow-xl transform transition-all sm:max-w-lg sm:w-full sm:p-6" role="dialog" aria-modal="true" aria-labelledby="modal-headline">
+        <div class="hidden sm:block absolute top-0 right-0 pt-4 pr-4">
+            <button @click="{{ $property }} = false" type="button" class="text-gray-400 hover:text-gray-500 focus:outline-none focus:text-gray-500 transition ease-in-out duration-150" aria-label="Close">
+                <svg class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+                </svg>
+            </button>
+        </div>
+        <div class="sm:flex sm:items-start">
+            <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
+                <h3 class="text-lg leading-6 font-medium text-gray-900" id="modal-headline">
+                    {{ $title }}
+                </h3>
+                <div class="mt-2">
+                    <p class="text-sm leading-5 text-gray-500">
+                        {{ $content }}
+                    </p>
+                </div>
+            </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 a5045a93d8db..ca01fccdf310 100644
--- a/resources/views/portal/ninja2020/auth/register.blade.php
+++ b/resources/views/portal/ninja2020/auth/register.blade.php
@@ -2,7 +2,7 @@
 @section('meta_title', ctrans('texts.register'))
 
 @section('body')
-    <div class="grid lg:grid-cols-12 py-8" x-data="{ more: false }">
+    <div class="grid lg:grid-cols-12 py-8">
         <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') }}">
@@ -10,7 +10,7 @@
             <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">
+            <form action="{{ route('client.register', request()->route('company_key')) }}" method="POST" x-data="{ more: false }">
                 @csrf
                 @include('portal.ninja2020.auth.includes.register.personal_information')
 
@@ -21,18 +21,22 @@
                     @include('portal.ninja2020.auth.includes.register.personal_address')
                     @include('portal.ninja2020.auth.includes.register.shipping_address')
                 </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>
+                    <span class="inline-flex items-center" x-data="{ terms_of_service: false, privacy_policy: false }">
+                            @if(!empty($company->settings->client_signup_terms) || !empty($company->settings->client_signup_privacy_policy))
+                                <input type="checkbox" name="terms" class="form-checkbox mr-2 cursor-pointer" checked>
+                                <span class="text-sm text-gray-800">
+
+                                {{ ctrans('texts.i_agree') }}
+                            @endif
+
+                            @includeWhen(!empty($company->settings->client_signup_terms), 'portal.ninja2020.auth.includes.register.popup', ['property' => 'terms_of_service', 'title' => ctrans('texts.terms_of_service'), 'content' => $company->settings->client_signup_terms])
+                            @includeWhen(!empty($company->settings->client_signup_privacy_policy), 'portal.ninja2020.auth.includes.register.popup', ['property' => 'privacy_policy', 'title' => ctrans('texts.privacy_policy'), 'content' => $company->settings->client_signup_privacy_policy])
                         </span>
                     </span>
 
-                    <button class="button button-primary">
-                        @lang('texts.save')
-                    </button>
+                    <button class="button button-primary">{{ ctrans('texts.save') }}</button>
                 </div>
             </form>
         </div>