diff --git a/resources/views/billing-portal/v3/authentication/register-form.blade.php b/resources/views/billing-portal/v3/authentication/register-form.blade.php
index 8c1cf68a0545..5ebb0a7de21c 100644
--- a/resources/views/billing-portal/v3/authentication/register-form.blade.php
+++ b/resources/views/billing-portal/v3/authentication/register-form.blade.php
@@ -122,6 +122,25 @@
         @endif
     </div>
 
+    <div class="col-span-12 md:col-span-6">
+        <span class="inline-flex items-center" x-data="{ terms_of_service: false, privacy_policy: false }">
+            @if(!empty($subscription->company->settings->client_portal_terms) || !empty($subscription->company->settings->client_portal_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_to_the') }}
+            @endif
+
+            @includeWhen(!empty($subscription->company->settings->client_portal_terms), 'portal.ninja2020.auth.includes.register.popup', ['property' => 'terms_of_service', 'title' => ctrans('texts.terms_of_service'), 'content' => $subscription->company->settings->client_portal_terms])
+            @includeWhen(!empty($subscription->company->settings->client_portal_privacy_policy), 'portal.ninja2020.auth.includes.register.popup', ['property' => 'privacy_policy', 'title' => ctrans('texts.privacy_policy'), 'content' => $subscription->company->settings->client_portal_privacy_policy])
+
+            @error('terms')
+                <p class="text-red-600">{{ $message }}</p>
+            @enderror
+            </span>
+        </span>
+    </div>
+
     <button
         type="submit"
         class="button button-block bg-primary text-white mt-4">
diff --git a/resources/views/portal/ninja2020/auth/includes/register/popup.blade.php b/resources/views/portal/ninja2020/auth/includes/register/popup.blade.php
index 205231686557..eedfc3db6efc 100644
--- a/resources/views/portal/ninja2020/auth/includes/register/popup.blade.php
+++ b/resources/views/portal/ninja2020/auth/includes/register/popup.blade.php
@@ -2,7 +2,7 @@
 
 <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 }}" class="fixed bottom-0 inset-x-0 px-4 pb-4 sm:inset-0 sm:flex sm:items-center sm:justify-center z-10">
     <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>