diff --git a/assets/javascripts/discourse/components/payment-options.js.es6 b/assets/javascripts/discourse/components/payment-options.js.es6
index 13acc30..f8616c6 100644
--- a/assets/javascripts/discourse/components/payment-options.js.es6
+++ b/assets/javascripts/discourse/components/payment-options.js.es6
@@ -10,6 +10,6 @@ export default Component.extend({
   actions: {
     clickPlan(plan) {
       this.set("selectedPlan", plan.id);
-    },
-  },
+    }
+  }
 });
diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show-plans-show.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show-plans-show.js.es6
index dcbb3ab..3f97991 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show-plans-show.js.es6
+++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show-plans-show.js.es6
@@ -22,8 +22,11 @@ export default Route.extend({
         product: product.get("id")
       });
     } else {
-      plan = AdminPlan.find(id);
-      plan.isRecurring = plan.type === "recurring";
+      plan = AdminPlan.find(id).then(result => {
+        result.isRecurring = result.type === "recurring";
+
+        return result;
+      });
     }
 
     const groups = Group.findAll({ ignore_automatic: true });
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.hbs
index 5285e76..d9ae1d4 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.hbs
@@ -44,7 +44,12 @@
       {{i18n 'discourse_subscriptions.admin.plans.plan.recurring'}}
     </label>
     {{#if planFieldDisabled}}
-      {{input disabled=true value=model.plan.isRecurring}}
+      {{input 
+        type="checkbox" 
+        name="recurring" 
+        checked=model.plan.isRecurring
+        disabled=true
+      }}
     {{else}}
       {{input 
         type="checkbox"