diff --git a/config/firefly.php b/config/firefly.php
index cbcf6d1b33..f6dce66942 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -616,7 +616,7 @@ return [
     'allowed_opposing_types'    => [
         'source'      => [
             AccountType::ASSET           => [AccountType::ASSET, AccountType::CASH, AccountType::DEBT, AccountType::EXPENSE, AccountType::INITIAL_BALANCE,
-                                             AccountType::LOAN, AccountType::RECONCILIATION,],
+                                             AccountType::LOAN, AccountType::RECONCILIATION, AccountType::MORTGAGE],
             AccountType::CASH            => [AccountType::ASSET],
             AccountType::DEBT            => [AccountType::ASSET, AccountType::DEBT, AccountType::EXPENSE, AccountType::INITIAL_BALANCE, AccountType::LOAN,
                                              AccountType::MORTGAGE,],
diff --git a/routes/api.php b/routes/api.php
index 45b8561c59..447649769f 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -56,6 +56,15 @@ Route::group(
     }
 );
 
+Route::group(
+    ['namespace' => 'FireflyIII\Api\V1\Controllers\Autocomplete', 'prefix' => 'autocomplete',
+     'as'        => 'api.v1.autocomplete.',],
+    static function () {
+        // Auto complete routes
+        Route::get('accounts', ['uses' => 'AccountController@accounts', 'as' => 'accounts']);
+    }
+);
+
 Route::group(
     ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'groups',
      'as'        => 'api.v1.object-groups.',],
diff --git a/routes/web.php b/routes/web.php
index c55a45396d..553c7715ab 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -604,7 +604,7 @@ Route::group(
     static function () {
 
     // for auto complete
-        Route::get('accounts', ['uses' => 'Json\AutoCompleteController@accounts', 'as' => 'autocomplete.accounts']);
+        //Route::get('accounts', ['uses' => 'Json\AutoCompleteController@accounts', 'as' => 'autocomplete.accounts']);
         Route::get('revenue-accounts', ['uses' => 'Json\AutoCompleteController@revenueAccounts', 'as' => 'autocomplete.revenue-accounts']);
         Route::get('expense-accounts', ['uses' => 'Json\AutoCompleteController@expenseAccounts', 'as' => 'autocomplete.expense-accounts']);
         Route::get('asset-accounts', ['uses' => 'Json\AutoCompleteController@assetAccounts', 'as' => 'autocomplete.asset-accounts']);