diff --git a/resources/views/payments/paymentmethods.blade.php b/resources/views/payments/paymentmethods.blade.php
index ebeb744324c3..ddea33477d5c 100644
--- a/resources/views/payments/paymentmethods.blade.php
+++ b/resources/views/payments/paymentmethods.blade.php
@@ -11,7 +11,9 @@
                     @include('payments.paymentmethods_list')
                 </div>
                 <div class="pull-right">
-                    {!! Button::success(strtoupper(trans("texts.edit_details")))->asLinkTo(URL::to('/client/details'))->withAttributes(['id' => 'editDetailsButton']) !!}
+                    @if (! empty($account) && $account->enable_client_portal || $account->enable_client_portal_dashboard)
+                        {!! Button::success(strtoupper(trans("texts.edit_details")))->asLinkTo(URL::to('/client/details'))->withAttributes(['id' => 'editDetailsButton']) !!}
+                    @endif
                 </div>
             </div>
         </div>
diff --git a/resources/views/public/header.blade.php b/resources/views/public/header.blade.php
index d7c510adc5b5..3b554201f8d1 100644
--- a/resources/views/public/header.blade.php
+++ b/resources/views/public/header.blade.php
@@ -79,8 +79,8 @@
                 @endif
             </div>
             <div id="navbar" class="collapse navbar-collapse">
-                @if (!empty($account) && $account->enable_client_portal)
                 <ul class="nav navbar-nav navbar-right">
+                @if (! empty($account) && $account->enable_client_portal)
                     @if (isset($account) && $account->enable_client_portal_dashboard)
                         <li {!! Request::is('*client/dashboard*') ? 'class="active"' : '' !!}>
                             {!! link_to('/client/dashboard', trans('texts.dashboard') ) !!}
@@ -124,8 +124,14 @@
                             {!! link_to('/client/logout', trans('texts.logout')) !!}
                         </li>
                     @endif
-                </ul>
+                @elseif (! empty($account))
+                    @if (isset($hasPaymentMethods) && $hasPaymentMethods)
+                        <li {!! Request::is('*client/payment_methods') ? 'class="active"' : '' !!}>
+                            {!! link_to('/client/payment_methods', trans('texts.payment_methods') ) !!}
+                        </li>
+                    @endif
                 @endif
+                </ul>
             </div><!--/.nav-collapse -->
         </div>
     </nav>