diff --git a/app/Http/Controllers/GoogleChartController.php b/app/Http/Controllers/GoogleChartController.php
index 9fe515eeef..dfd6ff5249 100644
--- a/app/Http/Controllers/GoogleChartController.php
+++ b/app/Http/Controllers/GoogleChartController.php
@@ -21,6 +21,8 @@ use Steam;
  */
 class GoogleChartController extends Controller
 {
+
+
     /**
      * @param GChart $chart
      *
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 1e256f6378..0d6056761f 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -1,6 +1,7 @@
 <?php namespace FireflyIII\Http\Controllers;
 
 use Auth;
+use Cache;
 use Carbon\Carbon;
 use Navigation;
 use Preferences;
@@ -16,15 +17,21 @@ use URL;
 class HomeController extends Controller
 {
 
-
     /**
      *
      */
     public function __construct()
     {
-        $this->middleware('auth');
-        $this->middleware('range');
-        //$this->middleware('guest');
+    }
+
+    /**
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function flush()
+    {
+        Cache::flush();
+
+        return Redirect::route('index');
     }
 
     /**
@@ -49,21 +56,22 @@ class HomeController extends Controller
 
         foreach ($accounts as $account) {
             $set = Auth::user()
-                ->transactionjournals()
-                ->with(['transactions', 'transactioncurrency', 'transactiontype'])
-                ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')->where('accounts.id', $account->id)
-                ->where('date', '>=', $start->format('Y-m-d'))
-                ->where('date', '<=', $end->format('Y-m-d'))
-                ->orderBy('transaction_journals.date', 'DESC')
-                ->orderBy('transaction_journals.id', 'DESC')
-                ->take(10)
-                ->get(['transaction_journals.*']);
+                       ->transactionjournals()
+                       ->with(['transactions', 'transactioncurrency', 'transactiontype'])
+                       ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                       ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')->where('accounts.id', $account->id)
+                       ->where('date', '>=', $start->format('Y-m-d'))
+                       ->where('date', '<=', $end->format('Y-m-d'))
+                       ->orderBy('transaction_journals.date', 'DESC')
+                       ->orderBy('transaction_journals.id', 'DESC')
+                       ->take(10)
+                       ->get(['transaction_journals.*']);
             if (count($set) > 0) {
                 $transactions[] = [$set, $account];
             }
         }
-//        var_dump($transactions);
+
+        //        var_dump($transactions);
 
         return view('index', compact('count', 'title', 'subTitle', 'mainTitleIcon', 'transactions'));
     }
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 41fb237c2b..fd403496e5 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -3,145 +3,149 @@
 /**
  * Home Controller
  */
-Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']);
-Route::get('/prev', ['uses' => 'HomeController@sessionPrev', 'as' => 'sessionPrev']);
-Route::get('/next', ['uses' => 'HomeController@sessionNext', 'as' => 'sessionNext']);
-Route::get('/jump/{range}', ['uses' => 'HomeController@rangeJump', 'as' => 'rangeJump']);
+Route::group(
+    ['middleware' => ['auth','range']], function () {
+    Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']);
+    Route::get('/prev', ['uses' => 'HomeController@sessionPrev', 'as' => 'sessionPrev']);
+    Route::get('/next', ['uses' => 'HomeController@sessionNext', 'as' => 'sessionNext']);
+    Route::get('/jump/{range}', ['uses' => 'HomeController@rangeJump', 'as' => 'rangeJump']);
+    Route::get('/flush', ['uses' => 'HomeController@flush', 'as' => 'flush']);
+    /**
+     * Account Controller
+     */
+    Route::get('/accounts/{what}', ['uses' => 'AccountController@index', 'as' => 'accounts.index'])->where('what', 'revenue|asset|expense');
+    Route::get('/accounts/create/{what}', ['uses' => 'AccountController@create', 'as' => 'accounts.create'])->where('what', 'revenue|asset|expense');
+    //Route::get('/accounts/edit/{account}', ['uses' => 'AccountController@edit', 'as' => 'accounts.edit']);
+    //Route::get('/accounts/delete/{account}', ['uses' => 'AccountController@delete', 'as' => 'accounts.delete']);
+    Route::get('/accounts/show/{account}/{view?}', ['uses' => 'AccountController@show', 'as' => 'accounts.show']);
 
-/**
- * Account Controller
- */
-Route::get('/accounts/{what}', ['uses' => 'AccountController@index', 'as' => 'accounts.index'])->where('what', 'revenue|asset|expense');
-Route::get('/accounts/create/{what}', ['uses' => 'AccountController@create', 'as' => 'accounts.create'])->where('what', 'revenue|asset|expense');
-//Route::get('/accounts/edit/{account}', ['uses' => 'AccountController@edit', 'as' => 'accounts.edit']);
-//Route::get('/accounts/delete/{account}', ['uses' => 'AccountController@delete', 'as' => 'accounts.delete']);
-Route::get('/accounts/show/{account}/{view?}', ['uses' => 'AccountController@show', 'as' => 'accounts.show']);
+    /**
+     * Bills Controller
+     */
+    Route::get('/bills', ['uses' => 'BillController@index', 'as' => 'bills.index']);
+    //Route::get('/bills/rescan/{bill}', ['uses' => 'BillController@rescan', 'as' => 'bills.rescan']); # rescan for matching.
+    Route::get('/bills/create', ['uses' => 'BillController@create', 'as' => 'bills.create']);
+    //Route::get('/bills/edit/{bill}', ['uses' => 'BillController@edit', 'as' => 'bills.edit']);
+    //Route::get('/bills/delete/{bill}', ['uses' => 'BillController@delete', 'as' => 'bills.delete']);
+    //Route::get('/bills/show/{bill}', ['uses' => 'BillController@show', 'as' => 'bills.show']);
 
-/**
- * Bills Controller
- */
-Route::get('/bills', ['uses' => 'BillController@index', 'as' => 'bills.index']);
-//Route::get('/bills/rescan/{bill}', ['uses' => 'BillController@rescan', 'as' => 'bills.rescan']); # rescan for matching.
-Route::get('/bills/create', ['uses' => 'BillController@create', 'as' => 'bills.create']);
-//Route::get('/bills/edit/{bill}', ['uses' => 'BillController@edit', 'as' => 'bills.edit']);
-//Route::get('/bills/delete/{bill}', ['uses' => 'BillController@delete', 'as' => 'bills.delete']);
-//Route::get('/bills/show/{bill}', ['uses' => 'BillController@show', 'as' => 'bills.show']);
+    /**
+     * Budget Controller
+     */
+    Route::get('/budgets', ['uses' => 'BudgetController@index', 'as' => 'budgets.index']);
+    //Route::get('/budgets/income', ['uses' => 'BudgetController@updateIncome', 'as' => 'budgets.income']); # extra.
+    //Route::get('/budgets/create', ['uses' => 'BudgetController@create', 'as' => 'budgets.create']);
+    //Route::get('/budgets/edit/{budget}', ['uses' => 'BudgetController@edit', 'as' => 'budgets.edit']);
+    //Route::get('/budgets/delete/{budget}', ['uses' => 'BudgetController@delete', 'as' => 'budgets.delete']);
+    //Route::get('/budgets/show/{budget}/{limitrepetition?}', ['uses' => 'BudgetController@show', 'as' => 'budgets.show']);
+    //Route::get('/budgets/list/noBudget', ['uses' => 'BudgetController@noBudget', 'as' => 'budgets.noBudget']);
 
-/**
- * Budget Controller
- */
-Route::get('/budgets', ['uses' => 'BudgetController@index', 'as' => 'budgets.index']);
-//Route::get('/budgets/income', ['uses' => 'BudgetController@updateIncome', 'as' => 'budgets.income']); # extra.
-//Route::get('/budgets/create', ['uses' => 'BudgetController@create', 'as' => 'budgets.create']);
-//Route::get('/budgets/edit/{budget}', ['uses' => 'BudgetController@edit', 'as' => 'budgets.edit']);
-//Route::get('/budgets/delete/{budget}', ['uses' => 'BudgetController@delete', 'as' => 'budgets.delete']);
-//Route::get('/budgets/show/{budget}/{limitrepetition?}', ['uses' => 'BudgetController@show', 'as' => 'budgets.show']);
-//Route::get('/budgets/list/noBudget', ['uses' => 'BudgetController@noBudget', 'as' => 'budgets.noBudget']);
+    /**
+     * Category Controller
+     */
+    Route::get('/categories', ['uses' => 'CategoryController@index', 'as' => 'categories.index']);
+    //Route::get('/categories/create', ['uses' => 'CategoryController@create', 'as' => 'categories.create']);
+    //Route::get('/categories/edit/{category}', ['uses' => 'CategoryController@edit', 'as' => 'categories.edit']);
+    //Route::get('/categories/delete/{category}', ['uses' => 'CategoryController@delete', 'as' => 'categories.delete']);
+    //Route::get('/categories/show/{category}', ['uses' => 'CategoryController@show', 'as' => 'categories.show']);
+    //Route::get('/categories/list/noCategory', ['uses' => 'CategoryController@noCategory', 'as' => 'categories.noCategory']);
 
-/**
- * Category Controller
- */
-Route::get('/categories', ['uses' => 'CategoryController@index', 'as' => 'categories.index']);
-//Route::get('/categories/create', ['uses' => 'CategoryController@create', 'as' => 'categories.create']);
-//Route::get('/categories/edit/{category}', ['uses' => 'CategoryController@edit', 'as' => 'categories.edit']);
-//Route::get('/categories/delete/{category}', ['uses' => 'CategoryController@delete', 'as' => 'categories.delete']);
-//Route::get('/categories/show/{category}', ['uses' => 'CategoryController@show', 'as' => 'categories.show']);
-//Route::get('/categories/list/noCategory', ['uses' => 'CategoryController@noCategory', 'as' => 'categories.noCategory']);
+    /**
+     * Currency Controller
+     */
+    Route::get('/currency', ['uses' => 'CurrencyController@index', 'as' => 'currency.index']);
+    //Route::get('/currency/create', ['uses' => 'CurrencyController@create', 'as' => 'currency.create']);
+    //Route::get('/currency/edit/{currency}', ['uses' => 'CurrencyController@edit', 'as' => 'currency.edit']);
+    //Route::get('/currency/delete/{currency}', ['uses' => 'CurrencyController@delete', 'as' => 'currency.delete']);
+    //Route::get('/currency/default/{currency}', ['uses' => 'CurrencyController@defaultCurrency', 'as' => 'currency.default']);
 
-/**
- * Currency Controller
- */
-Route::get('/currency', ['uses' => 'CurrencyController@index', 'as' => 'currency.index']);
-//Route::get('/currency/create', ['uses' => 'CurrencyController@create', 'as' => 'currency.create']);
-//Route::get('/currency/edit/{currency}', ['uses' => 'CurrencyController@edit', 'as' => 'currency.edit']);
-//Route::get('/currency/delete/{currency}', ['uses' => 'CurrencyController@delete', 'as' => 'currency.delete']);
-//Route::get('/currency/default/{currency}', ['uses' => 'CurrencyController@defaultCurrency', 'as' => 'currency.default']);
-
-/**
- * Google Chart Controller
- */
-Route::get('/chart/home/account', ['uses' => 'GoogleChartController@allAccountsBalanceChart']);
-Route::get('/chart/home/budgets', ['uses' => 'GoogleChartController@allBudgetsHomeChart']);
-//Route::get('/chart/home/categories', ['uses' => 'GoogleChartController@allCategoriesHomeChart']);
-//Route::get('/chart/home/bills', ['uses' => 'GoogleChartController@billsOverview']);
-//Route::get('/chart/account/{account}/{view?}', ['uses' => 'GoogleChartController@accountBalanceChart']);
-//Route::get('/chart/reports/income-expenses/{year}', ['uses' => 'GoogleChartController@yearInExp']);
-//Route::get('/chart/reports/income-expenses-sum/{year}', ['uses' => 'GoogleChartController@yearInExpSum']);
-//Route::get('/chart/bills/{bill}', ['uses' => 'GoogleChartController@billOverview']);
+    /**
+     * Google Chart Controller
+     */
+    Route::get('/chart/home/account', ['uses' => 'GoogleChartController@allAccountsBalanceChart']);
+    Route::get('/chart/home/budgets', ['uses' => 'GoogleChartController@allBudgetsHomeChart']);
+    //Route::get('/chart/home/categories', ['uses' => 'GoogleChartController@allCategoriesHomeChart']);
+    //Route::get('/chart/home/bills', ['uses' => 'GoogleChartController@billsOverview']);
+    //Route::get('/chart/account/{account}/{view?}', ['uses' => 'GoogleChartController@accountBalanceChart']);
+    //Route::get('/chart/reports/income-expenses/{year}', ['uses' => 'GoogleChartController@yearInExp']);
+    //Route::get('/chart/reports/income-expenses-sum/{year}', ['uses' => 'GoogleChartController@yearInExpSum']);
+    //Route::get('/chart/bills/{bill}', ['uses' => 'GoogleChartController@billOverview']);
 
 
-/**
- * Piggy Bank Controller
- */
-// piggy bank controller
-Route::get('/piggy_banks', ['uses' => 'PiggyBankController@index', 'as' => 'piggy_banks.index']);
-//Route::get('/piggy_banks/add/{piggyBank}', ['uses' => 'PiggyBankController@add']); # add money
-//Route::get('/piggy_banks/remove/{piggyBank}', ['uses' => 'PiggyBankController@remove']); #remove money
-//Route::get('/piggy_banks/create', ['uses' => 'PiggyBankController@create', 'as' => 'piggy_banks.create']);
-//Route::get('/piggy_banks/edit/{piggyBank}', ['uses' => 'PiggyBankController@edit', 'as' => 'piggy_banks.edit']);
-//Route::get('/piggy_banks/delete/{piggyBank}', ['uses' => 'PiggyBankController@delete', 'as' => 'piggy_banks.delete']);
-//Route::get('/piggy_banks/show/{piggyBank}', ['uses' => 'PiggyBankController@show', 'as' => 'piggy_banks.show']);
+    /**
+     * Piggy Bank Controller
+     */
+    // piggy bank controller
+    Route::get('/piggy_banks', ['uses' => 'PiggyBankController@index', 'as' => 'piggy_banks.index']);
+    //Route::get('/piggy_banks/add/{piggyBank}', ['uses' => 'PiggyBankController@add']); # add money
+    //Route::get('/piggy_banks/remove/{piggyBank}', ['uses' => 'PiggyBankController@remove']); #remove money
+    //Route::get('/piggy_banks/create', ['uses' => 'PiggyBankController@create', 'as' => 'piggy_banks.create']);
+    //Route::get('/piggy_banks/edit/{piggyBank}', ['uses' => 'PiggyBankController@edit', 'as' => 'piggy_banks.edit']);
+    //Route::get('/piggy_banks/delete/{piggyBank}', ['uses' => 'PiggyBankController@delete', 'as' => 'piggy_banks.delete']);
+    //Route::get('/piggy_banks/show/{piggyBank}', ['uses' => 'PiggyBankController@show', 'as' => 'piggy_banks.show']);
 
-/**
- * Preferences Controller
- */
-Route::get('/preferences', ['uses' => 'PreferencesController@index', 'as' => 'preferences']);
+    /**
+     * Preferences Controller
+     */
+    Route::get('/preferences', ['uses' => 'PreferencesController@index', 'as' => 'preferences']);
 
-/**
- * Profile Controller
- */
-Route::get('/profile', ['uses' => 'ProfileController@index', 'as' => 'profile']);
-//Route::get('/profile/change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']);
+    /**
+     * Profile Controller
+     */
+    Route::get('/profile', ['uses' => 'ProfileController@index', 'as' => 'profile']);
+    //Route::get('/profile/change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']);
 
-/**
- * Repeated Expenses Controller
- */
-Route::get('/repeatedexpenses', ['uses' => 'RepeatedExpenseController@index', 'as' => 'repeated.index']);
-//Route::get('/repeatedexpenses/create', ['uses' => 'RepeatedExpenseController@create', 'as' => 'repeated.create']);
-//Route::get('/repeatedexpenses/edit/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@edit', 'as' => 'repeated.edit']);
-//Route::get('/repeatedexpenses/delete/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@delete', 'as' => 'repeated.delete']);
-//Route::get('/repeatedexpenses/show/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@show', 'as' => 'repeated.show']);
+    /**
+     * Repeated Expenses Controller
+     */
+    Route::get('/repeatedexpenses', ['uses' => 'RepeatedExpenseController@index', 'as' => 'repeated.index']);
+    //Route::get('/repeatedexpenses/create', ['uses' => 'RepeatedExpenseController@create', 'as' => 'repeated.create']);
+    //Route::get('/repeatedexpenses/edit/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@edit', 'as' => 'repeated.edit']);
+    //Route::get('/repeatedexpenses/delete/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@delete', 'as' => 'repeated.delete']);
+    //Route::get('/repeatedexpenses/show/{repeatedExpense}', ['uses' => 'RepeatedExpenseController@show', 'as' => 'repeated.show']);
 
-/**
- * Report Controller
- */
-Route::get('/reports', ['uses' => 'ReportController@index', 'as' => 'reports.index']);
-//Route::get('/reports/{year}', ['uses' => 'ReportController@year', 'as' => 'reports.year']);
-//Route::get('/reports/{year}/{month}', ['uses' => 'ReportController@month', 'as' => 'reports.month']);
-//Route::get('/reports/budget/{year}/{month}', ['uses' => 'ReportController@budget', 'as' => 'reports.budget']);
+    /**
+     * Report Controller
+     */
+    Route::get('/reports', ['uses' => 'ReportController@index', 'as' => 'reports.index']);
+    //Route::get('/reports/{year}', ['uses' => 'ReportController@year', 'as' => 'reports.year']);
+    //Route::get('/reports/{year}/{month}', ['uses' => 'ReportController@month', 'as' => 'reports.month']);
+    //Route::get('/reports/budget/{year}/{month}', ['uses' => 'ReportController@budget', 'as' => 'reports.budget']);
 
-/**
- * Search Controller
- */
-Route::get('/search', ['uses' => 'SearchController@index', 'as' => 'search']);
+    /**
+     * Search Controller
+     */
+    Route::get('/search', ['uses' => 'SearchController@index', 'as' => 'search']);
 
-/**
- * Transaction Controller
- */
-Route::get('/transactions/{what}', ['uses' => 'TransactionController@index', 'as' => 'transactions.index'])->where(
-    ['what' => 'expenses|revenue|withdrawal|deposit|transfer|transfers']
+    /**
+     * Transaction Controller
+     */
+    Route::get('/transactions/{what}', ['uses' => 'TransactionController@index', 'as' => 'transactions.index'])->where(
+        ['what' => 'expenses|revenue|withdrawal|deposit|transfer|transfers']
+    );
+    Route::get('/transactions/create/{what}', ['uses' => 'TransactionController@create', 'as' => 'transactions.create'])->where(
+        ['what' => 'expenses|revenue|withdrawal|deposit|transfer|transfers']
+    );
+    //Route::get('/transaction/edit/{tj}', ['uses' => 'TransactionController@edit', 'as' => 'transactions.edit']);
+    //Route::get('/transaction/delete/{tj}', ['uses' => 'TransactionController@delete', 'as' => 'transactions.delete']);
+    Route::get('/transaction/show/{tj}', ['uses' => 'TransactionController@show', 'as' => 'transactions.show']);
+    //Route::get('/transaction/relate/{tj}', ['uses' => 'TransactionController@relate', 'as' => 'transactions.relate']);
+    //Route::post('/transactions/relatedSearch/{tj}', ['uses' => 'TransactionController@relatedSearch', 'as' => 'transactions.relatedSearch']);
+    //Route::post('/transactions/alreadyRelated/{tj}', ['uses' => 'TransactionController@alreadyRelated', 'as' => 'transactions.alreadyRelated']);
+    //Route::post('/transactions/doRelate', ['uses' => 'TransactionController@doRelate', 'as' => 'transactions.doRelate']);
+    //Route::any('/transactions/unrelate/{tj}', ['uses' => 'TransactionController@unrelate', 'as' => 'transactions.unrelate']);
+
+    /**
+     * User Controller
+     * TODO move to AuthController
+     */
+    Route::get('/logout', ['uses' => 'UserController@logout', 'as' => 'logout']);
+
+}
 );
-Route::get('/transactions/create/{what}', ['uses' => 'TransactionController@create', 'as' => 'transactions.create'])->where(
-    ['what' => 'expenses|revenue|withdrawal|deposit|transfer|transfers']
-);
-//Route::get('/transaction/edit/{tj}', ['uses' => 'TransactionController@edit', 'as' => 'transactions.edit']);
-//Route::get('/transaction/delete/{tj}', ['uses' => 'TransactionController@delete', 'as' => 'transactions.delete']);
-Route::get('/transaction/show/{tj}', ['uses' => 'TransactionController@show', 'as' => 'transactions.show']);
-//Route::get('/transaction/relate/{tj}', ['uses' => 'TransactionController@relate', 'as' => 'transactions.relate']);
-//Route::post('/transactions/relatedSearch/{tj}', ['uses' => 'TransactionController@relatedSearch', 'as' => 'transactions.relatedSearch']);
-//Route::post('/transactions/alreadyRelated/{tj}', ['uses' => 'TransactionController@alreadyRelated', 'as' => 'transactions.alreadyRelated']);
-//Route::post('/transactions/doRelate', ['uses' => 'TransactionController@doRelate', 'as' => 'transactions.doRelate']);
-//Route::any('/transactions/unrelate/{tj}', ['uses' => 'TransactionController@unrelate', 'as' => 'transactions.unrelate']);
-
-/**
- * User Controller
- * TODO move to AuthController
- */
-Route::get('/logout', ['uses' => 'UserController@logout', 'as' => 'logout']);
-
 Route::controllers(
     [
-        'auth' => 'Auth\AuthController',
+        'auth'     => 'Auth\AuthController',
         'password' => 'Auth\PasswordController',
     ]
 );
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 3af9852ccb..88d31b7578 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -21,14 +21,9 @@ class Account extends Model
         return $this->belongsTo('FireflyIII\Models\AccountType');
     }
 
-    public function user()
+    public function getDates()
     {
-        return $this->belongsTo('FireflyIII\User');
-    }
-
-    public function transactions()
-    {
-        return $this->hasMany('FireflyIII\Models\Transaction');
+        return ['created_at', 'updated_at', 'deleted_at'];
     }
 
     public function scopeAccountTypeIn(EloquentBuilder $query, array $types)
@@ -40,9 +35,14 @@ class Account extends Model
         $query->whereIn('account_types.type', $types);
     }
 
-    public function getDates()
+    public function transactions()
     {
-        return ['created_at', 'updated_at','deleted_at'];
+        return $this->hasMany('FireflyIII\Models\Transaction');
+    }
+
+    public function user()
+    {
+        return $this->belongsTo('FireflyIII\User');
     }
 
 }
diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php
index 27c5e4eb29..582d9d3ec7 100644
--- a/app/Models/AccountMeta.php
+++ b/app/Models/AccountMeta.php
@@ -16,13 +16,14 @@ class AccountMeta extends Model
         return json_decode($value);
     }
 
-    public function setDataAttribute($value)
-    {
-        $this->attributes['data'] = json_encode($value);
-    }
     public function getDates()
     {
         return ['created_at', 'updated_at'];
     }
 
+    public function setDataAttribute($value)
+    {
+        $this->attributes['data'] = json_encode($value);
+    }
+
 }
diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php
index f327a403c1..f3967bafa2 100644
--- a/app/Models/AccountType.php
+++ b/app/Models/AccountType.php
@@ -10,6 +10,7 @@ class AccountType extends Model
     {
         return $this->hasMany('FireflyIII\Models\Account');
     }
+
     public function getDates()
     {
         return ['created_at', 'updated_at'];
diff --git a/app/Models/Bill.php b/app/Models/Bill.php
index afa5703c79..da3c71d537 100644
--- a/app/Models/Bill.php
+++ b/app/Models/Bill.php
@@ -5,6 +5,11 @@ use Illuminate\Database\Eloquent\Model;
 class Bill extends Model
 {
 
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'date'];
+    }
+
     public function transactionjournals()
     {
         return $this->hasMany('FireflyIII\Models\TransactionJournal');
@@ -14,10 +19,6 @@ class Bill extends Model
     {
         return $this->belongsTo('FireflyIII\User');
     }
-    public function getDates()
-    {
-        return ['created_at', 'updated_at','date'];
-    }
 
 
 }
diff --git a/app/Models/Budget.php b/app/Models/Budget.php
index e1e0f17607..58f0c0ed64 100644
--- a/app/Models/Budget.php
+++ b/app/Models/Budget.php
@@ -11,6 +11,11 @@ class Budget extends Model
         return $this->hasMany('FireflyIII\Models\BudgetLimit');
     }
 
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at'];
+    }
+
     public function limitrepetitions()
     {
         return $this->hasManyThrough('FireflyIII\Models\LimitRepetition', 'BudgetLimit', 'budget_id');
@@ -25,10 +30,6 @@ class Budget extends Model
     {
         return $this->belongsTo('FireflyIII\User');
     }
-    public function getDates()
-    {
-        return ['created_at', 'updated_at','deleted_at'];
-    }
 
 
 }
diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php
index bc7d704aec..0899b9dc97 100644
--- a/app/Models/BudgetLimit.php
+++ b/app/Models/BudgetLimit.php
@@ -10,13 +10,14 @@ class BudgetLimit extends Model
         return $this->belongsTo('FireflyIII\Models\Budget');
     }
 
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'startdate'];
+    }
+
     public function limitrepetitions()
     {
         return $this->hasMany('FireflyIII\Models\LimitRepetition');
     }
-    public function getDates()
-    {
-        return ['created_at', 'updated_at','startdate'];
-    }
 
 }
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 167178fe5d..0e0fbd6dda 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -5,6 +5,11 @@ use Illuminate\Database\Eloquent\Model;
 class Category extends Model
 {
 
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at'];
+    }
+
     public function transactionjournals()
     {
         return $this->belongsToMany('FireflyIII\Models\TransactionJournal', 'category_transaction_journal', 'category_id');
@@ -14,9 +19,5 @@ class Category extends Model
     {
         return $this->belongsTo('FireflyIII\User');
     }
-    public function getDates()
-    {
-        return ['created_at', 'updated_at','deleted_at'];
-    }
 
 }
diff --git a/app/Models/Component.php b/app/Models/Component.php
index 3f64bdb690..43a462e80a 100644
--- a/app/Models/Component.php
+++ b/app/Models/Component.php
@@ -7,6 +7,6 @@ class Component extends Model
 
     public function getDates()
     {
-        return ['created_at', 'updated_at','deleted_at'];
+        return ['created_at', 'updated_at', 'deleted_at'];
     }
 }
diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php
index d2f77a7750..9501c63b41 100644
--- a/app/Models/LimitRepetition.php
+++ b/app/Models/LimitRepetition.php
@@ -9,9 +9,10 @@ class LimitRepetition extends Model
     {
         return $this->belongsTo('FireflyIII\Models\BudgetLimit');
     }
+
     public function getDates()
     {
-        return ['created_at', 'updated_at','startdate','enddate'];
+        return ['created_at', 'updated_at', 'startdate', 'enddate'];
     }
 
 }
diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php
index 1a7e9920c4..55139268d5 100644
--- a/app/Models/PiggyBank.php
+++ b/app/Models/PiggyBank.php
@@ -10,6 +10,11 @@ class PiggyBank extends Model
         return $this->belongsTo('FireflyIII\Models\Account');
     }
 
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at', 'startdate', 'targetdate'];
+    }
+
     public function piggyBankEvents()
     {
         return $this->hasMany('FireflyIII\Models\PiggyBankEvent');
@@ -24,8 +29,4 @@ class PiggyBank extends Model
     {
         return $this->morphMany('FireflyIII\Models\Reminder', 'remindersable');
     }
-    public function getDates()
-    {
-        return ['created_at', 'updated_at','deleted_at','startdate','targetdate'];
-    }
 }
diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php
index 9c21182c6a..bf1cc37f49 100644
--- a/app/Models/PiggyBankEvent.php
+++ b/app/Models/PiggyBankEvent.php
@@ -5,6 +5,11 @@ use Illuminate\Database\Eloquent\Model;
 class PiggyBankEvent extends Model
 {
 
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'date'];
+    }
+
     public function piggyBank()
     {
         return $this->belongsTo('FireflyIII\Models\PiggyBank');
@@ -14,9 +19,5 @@ class PiggyBankEvent extends Model
     {
         return $this->belongsTo('FireflyIII\Models\TransactionJournal');
     }
-    public function getDates()
-    {
-        return ['created_at', 'updated_at','date'];
-    }
 
 }
diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php
index 14675c3cfc..f0d20643b7 100644
--- a/app/Models/PiggyBankRepetition.php
+++ b/app/Models/PiggyBankRepetition.php
@@ -5,13 +5,14 @@ use Illuminate\Database\Eloquent\Model;
 class PiggyBankRepetition extends Model
 {
 
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'startdate', 'targetdate'];
+    }
+
     public function piggyBank()
     {
         return $this->belongsTo('FireflyIII\Models\PiggyBank');
     }
-    public function getDates()
-    {
-        return ['created_at', 'updated_at','startdate','targetdate'];
-    }
 
 }
diff --git a/app/Models/Preference.php b/app/Models/Preference.php
index 42e3086b7a..cc10f47add 100644
--- a/app/Models/Preference.php
+++ b/app/Models/Preference.php
@@ -5,11 +5,18 @@ use Illuminate\Database\Eloquent\Model;
 class Preference extends Model
 {
 
+    protected $fillable = ['user_id', 'data', 'name'];
+
     public function getDataAttribute($value)
     {
         return json_decode($value);
     }
 
+    public function getDates()
+    {
+        return ['created_at', 'updated_at'];
+    }
+
     public function setDataAttribute($value)
     {
         $this->attributes['data'] = json_encode($value);
@@ -19,9 +26,5 @@ class Preference extends Model
     {
         return $this->belongsTo('FireflyIII\User');
     }
-    public function getDates()
-    {
-        return ['created_at', 'updated_at'];
-    }
 
 }
diff --git a/app/Models/Reminder.php b/app/Models/Reminder.php
index 784fee62e0..12e33d009a 100644
--- a/app/Models/Reminder.php
+++ b/app/Models/Reminder.php
@@ -5,6 +5,11 @@ use Illuminate\Database\Eloquent\Model;
 class Reminder extends Model
 {
 
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'startdate', 'enddate'];
+    }
+
     public function remindersable()
     {
         return $this->morphTo();
@@ -14,9 +19,5 @@ class Reminder extends Model
     {
         return $this->belongsTo('FireflyIII\User');
     }
-    public function getDates()
-    {
-        return ['created_at', 'updated_at','startdate','enddate'];
-    }
 
 }
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index 8421c02662..7eb172a1cb 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -10,12 +10,13 @@ class Transaction extends Model
         return $this->belongsTo('FireflyIII\Models\Account');
     }
 
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at'];
+    }
+
     public function transactionJournal()
     {
         return $this->belongsTo('FireflyIII\Models\TransactionJournal');
     }
-    public function getDates()
-    {
-        return ['created_at', 'updated_at','deleted_at'];
-    }
 }
diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php
index 557e4e406f..4dac839a3f 100644
--- a/app/Models/TransactionCurrency.php
+++ b/app/Models/TransactionCurrency.php
@@ -5,12 +5,13 @@ use Illuminate\Database\Eloquent\Model;
 class TransactionCurrency extends Model
 {
 
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at'];
+    }
+
     public function transactionJournals()
     {
         return $this->hasMany('FireflyIII\Models\TransactionJournal');
     }
-    public function getDates()
-    {
-        return ['created_at', 'updated_at','deleted_at'];
-    }
 }
diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php
index aae86f6222..0828846de7 100644
--- a/app/Models/TransactionGroup.php
+++ b/app/Models/TransactionGroup.php
@@ -5,6 +5,11 @@ use Illuminate\Database\Eloquent\Model;
 class TransactionGroup extends Model
 {
 
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at'];
+    }
+
     public function transactionjournals()
     {
         return $this->belongsToMany('FireflyIII\Models\TransactionJournal');
@@ -14,9 +19,5 @@ class TransactionGroup extends Model
     {
         return $this->belongsTo('FireflyIII\User');
     }
-    public function getDates()
-    {
-        return ['created_at', 'updated_at','deleted_at'];
-    }
 
 }
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index 75e32a531b..1d712f0021 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -25,7 +25,7 @@ class TransactionJournal extends Model
 
     public function getDates()
     {
-        return ['created_at', 'updated_at', 'date','deleted_at'];
+        return ['created_at', 'updated_at', 'date', 'deleted_at'];
     }
 
     public function getDescriptionAttribute($value)
diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php
index 89f717ef7b..2261ef16b5 100644
--- a/app/Models/TransactionType.php
+++ b/app/Models/TransactionType.php
@@ -5,12 +5,13 @@ use Illuminate\Database\Eloquent\Model;
 class TransactionType extends Model
 {
 
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'deleted_at'];
+    }
+
     public function transactionJournals()
     {
         return $this->hasMany('FireflyIII\Models\TransactionJournal');
     }
-    public function getDates()
-    {
-        return ['created_at', 'updated_at','deleted_at'];
-    }
 }
diff --git a/app/User.php b/app/User.php
index 595f1bcddc..ba823abfcb 100644
--- a/app/User.php
+++ b/app/User.php
@@ -16,7 +16,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      *
      * @var array
      */
-    protected $fillable = ['name', 'email', 'password'];
+    protected $fillable = ['email', 'password'];
     /**
      * The attributes excluded from the model's JSON form.
      *