diff --git a/assets/javascripts/discourse/controllers/discourse-post-event-builder.js.es6 b/assets/javascripts/discourse/controllers/discourse-post-event-builder.js.es6
index 9e8a99c1..f68006fa 100644
--- a/assets/javascripts/discourse/controllers/discourse-post-event-builder.js.es6
+++ b/assets/javascripts/discourse/controllers/discourse-post-event-builder.js.es6
@@ -21,10 +21,28 @@ export default Controller.extend(ModalFunctionality, {
     this.set("reminderUnits", ["minutes", "hours", "days", "weeks"]);
     this.set("reminderPeriods", ["before", "after"]);
     this.set("availableRecurrences", [
-      "every_day",
-      "every_month",
-      "every_weekday",
-      "every_week",
+      {
+        id: "every_day",
+        name: I18n.t("discourse_post_event.builder_modal.recurrence.every_day"),
+      },
+      {
+        id: "every_month",
+        name: I18n.t(
+          "discourse_post_event.builder_modal.recurrence.every_month"
+        ),
+      },
+      {
+        id: "every_weekday",
+        name: I18n.t(
+          "discourse_post_event.builder_modal.recurrence.every_weekday"
+        ),
+      },
+      {
+        id: "every_week",
+        name: I18n.t(
+          "discourse_post_event.builder_modal.recurrence.every_week"
+        ),
+      },
     ]);
   },
 
diff --git a/assets/javascripts/discourse/templates/modal/discourse-post-event-builder.hbs b/assets/javascripts/discourse/templates/modal/discourse-post-event-builder.hbs
index 667ecd40..c8ccfb9b 100644
--- a/assets/javascripts/discourse/templates/modal/discourse-post-event-builder.hbs
+++ b/assets/javascripts/discourse/templates/modal/discourse-post-event-builder.hbs
@@ -130,8 +130,6 @@
         {{combo-box
           class="available-recurrences"
           value=(readonly model.eventModel.recurrence)
-          nameProperty=null
-          valueProperty=null
           content=availableRecurrences
           onChange=(action (mut model.eventModel.recurrence))
           options=(hash none="discourse_post_event.builder_modal.recurrence.none")
diff --git a/assets/stylesheets/common/discourse-post-event-builder.scss b/assets/stylesheets/common/discourse-post-event-builder.scss
index 53c067d7..72df228a 100644
--- a/assets/stylesheets/common/discourse-post-event-builder.scss
+++ b/assets/stylesheets/common/discourse-post-event-builder.scss
@@ -112,6 +112,10 @@
       flex: 1;
       flex-direction: column;
 
+      .select-kit.available-recurrences {
+        width: 100%;
+      }
+
       .custom-field-label {
         font-weight: 500;
         margin: 0.5em 0 0.25em 0;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index b5c7d35b..daa4048a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -348,6 +348,10 @@ en:
         recurrence:
           label: Recurrence
           none: No recurrence
+          every_day: Every day
+          every_month: Every month at this weekday
+          every_weekday: Every weekday
+          every_week: Every week at this weekday
         url:
           label: URL
           placeholder: Optional