diff --git a/resources/views/accounts/account_gateway.blade.php b/resources/views/accounts/account_gateway.blade.php
index 28b345f60983..fd60a98ed77f 100644
--- a/resources/views/accounts/account_gateway.blade.php
+++ b/resources/views/accounts/account_gateway.blade.php
@@ -73,7 +73,7 @@
 
             @foreach ($gateway->fields as $field => $details)
 
-                @if ($details && !$accountGateway && !is_array($details) && !is_bool($details))
+                @if ($details && (!$accountGateway || !$accountGateway->getConfigField($field)) && !is_array($details) && !is_bool($details))
                     {!! Former::populateField($gateway->id.'_'.$field, $details) !!}
                 @endif