diff --git a/public/v1/js/ff/recurring/create.js b/public/v1/js/ff/recurring/create.js
index 281c3bbc84..0df274889d 100644
--- a/public/v1/js/ff/recurring/create.js
+++ b/public/v1/js/ff/recurring/create.js
@@ -40,10 +40,13 @@ $(document).ready(function () {
     $('#ffInput_repetition_end').on('change', respondToRepetitionEnd);
     $('#ffInput_first_date').on('change', respondToFirstDateChange);
 
+    // new date
+    var firstDate = $('#ffInput_first_date').val();
+
     // create calendar on load:
     calendar = $('#recurring_calendar').fullCalendar(
         {
-            defaultDate: '2018-06-13',
+            defaultDate: firstDate,
             editable: false,
             height: 400,
             width: 200,
diff --git a/public/v1/js/ff/recurring/edit.js b/public/v1/js/ff/recurring/edit.js
index c2c18a2ade..8127059ed4 100644
--- a/public/v1/js/ff/recurring/edit.js
+++ b/public/v1/js/ff/recurring/edit.js
@@ -40,10 +40,13 @@ $(document).ready(function () {
     $('#ffInput_repetition_end').on('change', respondToRepetitionEnd);
     $('#ffInput_first_date').on('change', respondToFirstDateChange);
 
+    // new date
+    var firstDate = $('#ffInput_first_date').val();
+
     // create calendar on load:
     calendar = $('#recurring_calendar').fullCalendar(
         {
-            defaultDate: '2018-06-13',
+            defaultDate: firstDate,
             editable: false,
             height: 400,
             width: 200,
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 15b88514aa..04c7debeca 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -1288,6 +1288,7 @@ return [
 
     // recurring transactions
     'recurrences'                           => 'Recurring transactions',
+    'recurring_calendar_view'               => 'Calendar',
     'no_recurring_title_default'            => 'Let\'s create a recurring transaction!',
     'no_recurring_intro_default'            => 'You have no recurring transactions yet. You can use these to make Firefly III automatically create transactions for you.',
     'no_recurring_imperative_default'       => 'This is a pretty advanced feature but it can be extremely useful. Make sure you read the documentation (?)-icon in the top right corner) before you continue.',
diff --git a/resources/views/v1/recurring/create.twig b/resources/views/v1/recurring/create.twig
index 89ae977b69..9edb4fcd82 100644
--- a/resources/views/v1/recurring/create.twig
+++ b/resources/views/v1/recurring/create.twig
@@ -173,7 +173,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title">Calendar view yay</h4>
+                <h4 class="modal-title">{{ 'recurring_calendar_view'|_ }}</h4>
             </div>
             <div class="modal-body">
                 <div id="recurring_calendar" style="max-width: 400px;margin: 0 auto;">
diff --git a/resources/views/v1/recurring/edit.twig b/resources/views/v1/recurring/edit.twig
index ced8de4da8..7d91a0d45e 100644
--- a/resources/views/v1/recurring/edit.twig
+++ b/resources/views/v1/recurring/edit.twig
@@ -20,7 +20,7 @@
                         {{ ExpandedForm.text('title') }}
                         {{ ExpandedForm.date('first_date',array.first_date, {helpText: trans('firefly.help_first_date_no_past')}) }}
                         {{ ExpandedForm.select('repetition_type', [], null, {helpText: trans('firefly.change_date_other_options')}) }}
-                        {{ ExpandedForm.number('skip', array.recurrence_repetitions[0].repetition_skip) }}
+                        {{ ExpandedForm.number('skip', array.recurrence_repetitions[0].skip) }}
                         {{ ExpandedForm.select('weekend', weekendResponses, array.recurrence_repetitions[0].weekend, {helpText: trans('firefly.help_weekend')}) }}
                         {{ ExpandedForm.select('repetition_end', repetitionEnds, repetitionEnd) }}
                         {{ ExpandedForm.date('repeat_until',array.repeat_until) }}
@@ -194,7 +194,7 @@
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title">Calendar view yay</h4>
+                <h4 class="modal-title">{{ 'recurring_calendar_view'|_ }}</h4>
             </div>
             <div class="modal-body">
                 <div id="recurring_calendar" style="max-width: 400px;margin: 0 auto;">