diff --git a/app/controllers/RecurringController.php b/app/controllers/RecurringController.php
index b38ab25fae..84be23917a 100644
--- a/app/controllers/RecurringController.php
+++ b/app/controllers/RecurringController.php
@@ -184,8 +184,10 @@ class RecurringController extends BaseController
     public function update(RecurringTransaction $recurringTransaction)
     {
         /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repos */
-        $repos = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
-        $data  = Input::except('_token');
+        $repos             = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
+        $data              = Input::except('_token');
+        $data['active']    = isset($data['active']) ? 1 : 0;
+        $data['automatch'] = isset($data['automatch']) ? 1 : 0;
 
         switch (Input::get('post_submit_action')) {
             default:
diff --git a/app/controllers/TransactionController.php b/app/controllers/TransactionController.php
index 6be3c41262..7f1eb8ca3a 100644
--- a/app/controllers/TransactionController.php
+++ b/app/controllers/TransactionController.php
@@ -214,10 +214,12 @@ class TransactionController extends BaseController
         $what = strtolower($journal->transactiontype->type);
 
         // get asset accounts with names and id's.
-        $accounts = FFForm::makeSelectList($accountRepository->getAssetAccounts());
+
         $budgets  = FFForm::makeSelectList($budgetRepository->get(), true);
+        $accounts = FFForm::makeSelectList($accountRepository->getAssetAccounts());
         $piggies  = FFForm::makeSelectList($piggyRepository->get(), true);
 
+
         /*
          * Data to properly display the edit form.
          */
diff --git a/app/lib/FireflyIII/Shared/Toolkit/Form.php b/app/lib/FireflyIII/Shared/Toolkit/Form.php
index 707fc0aac3..226ff34b2e 100644
--- a/app/lib/FireflyIII/Shared/Toolkit/Form.php
+++ b/app/lib/FireflyIII/Shared/Toolkit/Form.php
@@ -21,7 +21,7 @@ class Form
      *
      * @return mixed
      */
-    public function makeSelectList(Collection $set, $titleField = null, $addEmpty = false)
+    public function makeSelectList(Collection $set, $addEmpty = false)
     {
         $selectList = [];
         if ($addEmpty) {
@@ -32,7 +32,7 @@ class Form
         foreach ($set as $entry) {
             /** @noinspection PhpUndefinedFieldInspection */
             $id    = intval($entry->id);
-            $title = $titleField;
+            $title = null;
 
             foreach ($fields as $field) {
                 if (is_null($title) && isset($entry->$field)) {
diff --git a/app/models/RecurringTransaction.php b/app/models/RecurringTransaction.php
index fd598cf2c1..5019485416 100644
--- a/app/models/RecurringTransaction.php
+++ b/app/models/RecurringTransaction.php
@@ -70,6 +70,9 @@ class RecurringTransaction extends Eloquent
          * The date Firefly tries to find. If this stays null, it's "unknown".
          */
         $finalDate = null;
+        if ($this->active == 0) {
+            return $finalDate;
+        }
 
         /*
          * $today is the start of the next period, to make sure FF3 won't miss anything