diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 9e10021ab874..3c95bcbddba0 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -526,7 +526,7 @@ class Invoice extends EntityModel implements BalanceAffecting
         }
 
         if ($this->end_date) {
-            $rule .= 'UNTIL=' . $this->end_date;
+            $rule .= 'UNTIL=' . $this->getOriginal('end_date');
         }
 
         return $rule;
diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php
index ef01758e17d3..c5efffb3ff35 100644
--- a/app/Services/ImportService.php
+++ b/app/Services/ImportService.php
@@ -353,7 +353,7 @@ class ImportService
         $results = [];
 
         foreach ($maps as $entityType => $map) {
-            $result[$entityType] = $this->executeCSV($entityType, $map, $headers[$entityType]);
+            $results[$entityType] = $this->executeCSV($entityType, $map, $headers[$entityType]);
         }
 
         return $results;
diff --git a/resources/views/accounts/account_gateway.blade.php b/resources/views/accounts/account_gateway.blade.php
index 9c1f09cec351..411658e76f64 100644
--- a/resources/views/accounts/account_gateway.blade.php
+++ b/resources/views/accounts/account_gateway.blade.php
@@ -54,6 +54,10 @@
         <div id="gateway_{{ $gateway->id }}_div" class='gateway-fields' style="display: none">
             @foreach ($gateway->fields as $field => $details)
 
+                @if ($details && !$accountGateway)
+                    {!! Former::populateField($gateway->id.'_'.$field, $details) !!}
+                @endif
+
                 @if (in_array($field, $hiddenFields))
                     {{-- do nothing --}}
                 @elseif ($gateway->id == GATEWAY_DWOLLA && ($field == 'key' || $field == 'secret') 
diff --git a/vendor.zip b/vendor.zip
deleted file mode 100644
index c04dc601a68c..000000000000
Binary files a/vendor.zip and /dev/null differ