diff --git a/app/lib/FireflyIII/Database/Budget/Budget.php b/app/lib/FireflyIII/Database/Budget/Budget.php
index ad5f8f8ab1..d6df9dbbfc 100644
--- a/app/lib/FireflyIII/Database/Budget/Budget.php
+++ b/app/lib/FireflyIII/Database/Budget/Budget.php
@@ -247,9 +247,9 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface
     {
         return \LimitRepetition::
         leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
-                                  ->where('limit_repetitions.startdate', $date->format('Y-m-d 00:00:00'))
-                                  ->where('budget_limits.budget_id', $budget->id)
-                                  ->first(['limit_repetitions.*']);
+                               ->where('limit_repetitions.startdate', $date->format('Y-m-d 00:00:00'))
+                               ->where('budget_limits.budget_id', $budget->id)
+                               ->first(['limit_repetitions.*']);
     }
 
     /**
@@ -366,6 +366,9 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface
      */
     public function limitOnStartingOnDate(\Budget $budget, Carbon $date)
     {
-        return $budget->budgetLimits()->where('startdate', $date->format('Y-m-d'))->first();
+        return $budget->budgetLimits()->where('startdate', $date->format('Y-m-d 00:00:00'))->first();
+
+
+
     }
 }
\ No newline at end of file
diff --git a/app/models/Budget.php b/app/models/Budget.php
index e277b51ca6..f5860dd3cd 100644
--- a/app/models/Budget.php
+++ b/app/models/Budget.php
@@ -28,7 +28,7 @@ class Budget extends Eloquent
      */
     public function budgetlimits()
     {
-        return $this->hasMany('BudgetLimit', 'budget_id');
+        return $this->hasMany('BudgetLimit');
     }
 
     /**
diff --git a/app/models/BudgetLimit.php b/app/models/BudgetLimit.php
index 684ad1a11e..41887e41ed 100644
--- a/app/models/BudgetLimit.php
+++ b/app/models/BudgetLimit.php
@@ -1,9 +1,10 @@
 <?php
 
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Model as Eloquent;
 use Illuminate\Database\QueryException;
 use Watson\Validating\ValidatingTrait;
-use \Illuminate\Database\Eloquent\Model as Eloquent;
+
 /**
  * Class Limit
  */
@@ -13,11 +14,11 @@ class BudgetLimit extends Eloquent
     use ValidatingTrait;
     public static $rules
         = [
-            'budget_id' => 'required|exists:budgets,id',
-            'startdate'    => 'required|date',
-            'amount'       => 'numeric|required|min:0.01',
-            'repeats'      => 'required|boolean',
-            'repeat_freq'  => 'required|in:daily,weekly,monthly,quarterly,half-year,yearly'
+            'budget_id'   => 'required|exists:budgets,id',
+            'startdate'   => 'required|date',
+            'amount'      => 'numeric|required|min:0.01',
+            'repeats'     => 'required|boolean',
+            'repeat_freq' => 'required|in:daily,weekly,monthly,quarterly,half-year,yearly'
 
         ];
 
@@ -27,7 +28,7 @@ class BudgetLimit extends Eloquent
      */
     public function budget()
     {
-        return $this->belongsTo('Budget','budget_id');
+        return $this->belongsTo('Budget');
     }
 
     /**
diff --git a/app/models/Category.php b/app/models/Category.php
index 782a394585..4c68e41e65 100644
--- a/app/models/Category.php
+++ b/app/models/Category.php
@@ -36,7 +36,7 @@ class Category extends Eloquent
      */
     public function transactionjournals()
     {
-        return $this->belongsToMany('TransactionJournal', 'budget_transaction_journal', 'budget_id');
+        return $this->belongsToMany('TransactionJournal', 'category_transaction_journal', 'category_id');
     }
 
     /**