diff --git a/app/Ninja/Presenters/AccountPresenter.php b/app/Ninja/Presenters/AccountPresenter.php
index 53a1a7bb73c1..f95082322736 100644
--- a/app/Ninja/Presenters/AccountPresenter.php
+++ b/app/Ninja/Presenters/AccountPresenter.php
@@ -208,7 +208,7 @@ class AccountPresenter extends Presenter
 
         foreach ($fields as $key => $val) {
             if ($this->$key) {
-                $data[$this->$key] = [
+                $data[Utils::getCustomLabel($this->$key)] = [
                     'value' => $val,
                     'name' => $val,
                 ];
diff --git a/resources/views/accounts/client_portal.blade.php b/resources/views/accounts/client_portal.blade.php
index 1c57aa2e04e9..509273b60aaa 100644
--- a/resources/views/accounts/client_portal.blade.php
+++ b/resources/views/accounts/client_portal.blade.php
@@ -423,7 +423,7 @@ iframe.src = '{{ rtrim(SITE_URL ,'/') }}/view/'
 
         if (productId) {
             @if (Utils::isNinjaProd())
-                var domain = '{{ $account->present()->clientPortalLink(true) }}';
+                var domain = '{{ $account->present()->clientPortalLink(true) }}/buy_now';
             @else
                 var domain = '{{ url('/buy_now') }}';
             @endif