diff --git a/resources/views/accounts/client_portal.blade.php b/resources/views/accounts/client_portal.blade.php
index 7f46129eb260..dc9e4d491b73 100644
--- a/resources/views/accounts/client_portal.blade.php
+++ b/resources/views/accounts/client_portal.blade.php
@@ -432,10 +432,10 @@ iframe.src = '{{ rtrim(SITE_URL ,'/') }}/view/'
 
             var form = '<form action="' + link + '" method="post" target="_top">' + "\n";
 
-            @foreach (['custom_client1', 'custom_client2', 'custom_invoice1', 'custom_invoice2', 'custom_product1', 'custom_product2'] as $field)
-                if ($('input#{{ $field }}').is(':checked')) {
-                    form += '<input type="text" name="{{ $field }}" placeholder="{{ trans("texts.{$field}") }}" required/>' + "\n";
-                    link += '&{{ $field }}=';
+            @foreach ($account->present()->customTextFields as $field => $val)
+                if ($('input#{{ $val['name'] }}').is(':checked')) {
+                    form += '<input type="text" name="{{ $val['name'] }}" placeholder="{{ $field }}" required/>' + "\n";
+                    link += '&{{ $val['name'] }}=';
                 }
             @endforeach