diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php
index b4e083a3ad43..b8e82cddda48 100644
--- a/app/Http/Controllers/ExpenseController.php
+++ b/app/Http/Controllers/ExpenseController.php
@@ -146,12 +146,6 @@ class ExpenseController extends BaseController
 
         $data = array_merge($data, self::getViewModel());
 
-        if (Auth::user()->account->isNinjaAccount()) {
-            if ($account = Account::whereId($client->public_id)->first()) {
-                $data['proPlanPaid'] = $account['pro_plan_paid'];
-            }
-        }
-
         return View::make('expenses.edit', $data);
     }
 
diff --git a/resources/views/accounts/account_gateway.blade.php b/resources/views/accounts/account_gateway.blade.php
index c19268c258fd..db7200907263 100644
--- a/resources/views/accounts/account_gateway.blade.php
+++ b/resources/views/accounts/account_gateway.blade.php
@@ -6,7 +6,7 @@
     @include('accounts.nav', ['selected' => ACCOUNT_PAYMENTS])
 
     {!! Former::open($url)->method($method)->rule()->addClass('warn-on-exit') !!}
-    {!! Former::populate($account) !!}
+    {!! Former::populateField('token_billing_type_id', $account->token_billing_type_id) !!}
 
 
     <div class="panel panel-default">
@@ -63,7 +63,7 @@
 
             @foreach ($gateway->fields as $field => $details)
 
-                @if ($details && !$accountGateway)
+                @if ($details && !$accountGateway && !is_array($details))
                     {!! Former::populateField($gateway->id.'_'.$field, $details) !!}
                 @endif