diff --git a/app/assets/javascripts/firefly/transactions.js b/app/assets/javascripts/firefly/transactions.js
index d5221e6163..ca7013f11b 100644
--- a/app/assets/javascripts/firefly/transactions.js
+++ b/app/assets/javascripts/firefly/transactions.js
@@ -1,5 +1,8 @@
-$.getJSON('json/beneficiaries').success(function (data) {
-    $('input[name="beneficiary"]').typeahead({ source: data });
+$.getJSON('json/expense-accounts').success(function (data) {
+    $('input[name="expense_account"]').typeahead({ source: data });
+});
+$.getJSON('json/revenue-accounts').success(function (data) {
+    $('input[name="revenue_account"]').typeahead({ source: data });
 });
 
 $.getJSON('json/categories').success(function (data) {
diff --git a/app/controllers/JsonController.php b/app/controllers/JsonController.php
index 2d568e4ee1..bb753bd143 100644
--- a/app/controllers/JsonController.php
+++ b/app/controllers/JsonController.php
@@ -34,9 +34,24 @@ class JsonController extends BaseController
     /**
      * Returns a JSON list of all beneficiaries.
      */
-    public function beneficiaries()
+    public function expenseAccounts()
     {
-        $list   = $this->_accounts->getBeneficiaries();
+        $list   = $this->_accounts->getOfTypes(['Expense account','Beneficiary account']);
+        $return = [];
+        foreach ($list as $entry) {
+            $return[] = $entry->name;
+        }
+
+        return Response::json($return);
+
+    }
+
+    /**
+     * Returns a JSON list of all revenue accounts.
+     */
+    public function revenueAccounts()
+    {
+        $list   = $this->_accounts->getOfTypes(['Revenue account']);
         $return = [];
         foreach ($list as $entry) {
             $return[] = $entry->name;