diff --git a/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars b/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars
index fa59b815f1..039f3cd32c 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/edit_category.js.handlebars
@@ -88,9 +88,14 @@
       </div>
       <div {{bindAttr class=":modal-tab :options-tab settingsSelected::invisible"}}>
         <section class='field'>
-          <!-- Urgent @Neil , you missed this, get it working ASAP
-          autoCloseForm autoCloseDays=auto_close_days labelKey="category.auto_close_label"
-          -->
+          <div class="auto-close-fields">
+            <div>
+              <i class="icon icon-time"></i>
+              {{i18n category.auto_close_label}}
+              {{textField value=auto_close_days}}
+              {{i18n category.auto_close_units}}
+            </div>
+          </div>
         </section>
 
         <section class='field'>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 23130ac75f..b1abf9f576 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -984,6 +984,7 @@ en:
       already_used: 'This color has been used by another category'
       security: "Security"
       auto_close_label: "Auto-close topics after:"
+      auto_close_units: "days"
       edit_permissions: "Edit Permissions"
       add_permission: "Add Permission"
       this_year: "this year"