diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php
index d7b79673d8..0cb2a9c201 100644
--- a/app/Http/Controllers/Budget/CreateController.php
+++ b/app/Http/Controllers/Budget/CreateController.php
@@ -71,8 +71,8 @@ class CreateController extends Controller
     {
         $hasOldInput = null !== $request->old('_token');
 
-        // auto budget options
-        $autoBudgetOptions = [
+        // auto budget types
+        $autoBudgetTypes = [
             0 => (string)trans('firefly.auto_budget_none'),
             AutoBudget::AUTO_BUDGET_RESET => (string)trans('firefly.auto_budget_reset'),
             AutoBudget::AUTO_BUDGET_ROLLOVER => (string)trans('firefly.auto_budget_rollover'),
@@ -101,7 +101,7 @@ class CreateController extends Controller
         $request->session()->forget('budgets.create.fromStore');
         $subTitle = (string)trans('firefly.create_new_budget');
 
-        return view('budgets.create', compact('subTitle', 'autoBudgetOptions', 'autoBudgetPeriods'));
+        return view('budgets.create', compact('subTitle', 'autoBudgetTypes', 'autoBudgetPeriods'));
     }
 
 
diff --git a/app/Http/Requests/BudgetFormStoreRequest.php b/app/Http/Requests/BudgetFormStoreRequest.php
index 83dbd1fed9..330c000632 100644
--- a/app/Http/Requests/BudgetFormStoreRequest.php
+++ b/app/Http/Requests/BudgetFormStoreRequest.php
@@ -50,7 +50,7 @@ class BudgetFormStoreRequest extends Request
         return [
             'name'                    => $this->string('name'),
             'active'                  => $this->boolean('active'),
-            'auto_budget_type'      => $this->integer('auto_budget_type'),
+            'auto_budget_type'        => $this->integer('auto_budget_type'),
             'transaction_currency_id' => $this->integer('transaction_currency_id'),
             'auto_budget_amount'      => $this->string('auto_budget_amount'),
             'auto_budget_period'      => $this->string('auto_budget_period'),
@@ -67,8 +67,8 @@ class BudgetFormStoreRequest extends Request
         return [
             'name'                    => 'required|between:1,100|uniqueObjectForUser:budgets,name',
             'active'                  => 'numeric|between:0,1',
-            'auto_budget_option'      => 'numeric|between:0,2',
-            'transaction_currency_id' => 'required|exists:transaction_currencies,id',
+            'auto_budget_type'        => 'numeric|between:0,2',
+            'auto_budget_currency_id' => 'required|exists:transaction_currencies,id',
             'auto_budget_amount'      => 'min:0|max:1000000000',
             'auto_budget_period'      => 'in:daily,weekly,monthly,quarterly,half_year,yearly',
         ];
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 7234877b75..55372eb1dd 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -792,6 +792,7 @@ return [
     'auto_budget_period_quarterly'              => 'Quarterly',
     'auto_budget_period_half_year'              => 'Every half year',
     'auto_budget_period_yearly'                 => 'Yearly',
+    'auto_budget_help'                          => 'You can read more about this feature in the help. Click the top-right (?) icon.',
 
     // bills:
     'match_between_amounts'                     => 'Bill matches transactions between :low and :high.',
diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php
index 73952ff96f..e9fed2e35f 100644
--- a/resources/lang/en_US/form.php
+++ b/resources/lang/en_US/form.php
@@ -43,6 +43,7 @@ return [
     'journal_currency_id'       => 'Currency',
     'currency_id'               => 'Currency',
     'transaction_currency_id'   => 'Currency',
+    'auto_budget_currency_id'   => 'Currency',
     'external_ip'               => 'Your server\'s external IP',
     'attachments'               => 'Attachments',
     'journal_amount'            => 'Amount',
@@ -260,7 +261,7 @@ return [
     'expected_on'               => 'Expected on',
     'paid'                      => 'Paid',
 
-    'auto_budget_option'            => 'Auto-budget',
+    'auto_budget_type'            => 'Auto-budget',
     'auto_budget_amount'            => 'Auto-budget amount',
     'auto_budget_period'            => 'Auto-budget period',
 
diff --git a/resources/views/v1/budgets/create.twig b/resources/views/v1/budgets/create.twig
index 91713d29e8..7af530501a 100644
--- a/resources/views/v1/budgets/create.twig
+++ b/resources/views/v1/budgets/create.twig
@@ -28,8 +28,8 @@
                         <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
                     </div>
                     <div class="box-body">
-                        {{ ExpandedForm.select('auto_budget_option', autoBudgetOptions) }}
-                        {{ CurrencyForm.currencyList('transaction_currency_id') }}
+                        {{ ExpandedForm.select('auto_budget_type', autoBudgetTypes,null, {helpText: trans('firefly.auto_budget_help')}) }}
+                        {{ CurrencyForm.currencyList('auto_budget_currency_id') }}
                         {{ ExpandedForm.amountNoCurrency('auto_budget_amount') }}
                         {{ ExpandedForm.select('auto_budget_period', autoBudgetPeriods, null) }}
                     </div>