diff --git a/website/client/.eslintrc.js b/website/client/.eslintrc.js
index 7dc69cc284..56eb1c8668 100644
--- a/website/client/.eslintrc.js
+++ b/website/client/.eslintrc.js
@@ -14,6 +14,10 @@ module.exports = {
     // TODO find a way to let eslint understand webpack aliases
     'import/no-unresolved': 'off',
     'import/extensions': 'off',
+    'vue/component-tags-order': ['warn', {
+      order: [ 'template', 'style', 'script' ],
+    }],
+    'vue/no-mutating-props': 'warn',
     'vue/no-v-html': 'off',
     'vue/html-self-closing': ['error', {
       html: {
diff --git a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
index 50c3c1b135..8fa3cffb0b 100644
--- a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
+++ b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
@@ -43,42 +43,55 @@
           </label>
         </div>
         <div>
-          Months until renewal:
+          Perk offset months:
           <strong>{{ hero.purchased.plan.consecutive.offset }}</strong>
         </div>
-          <div>
-            Next Mystic Hourglass:
-            <strong>{{ nextHourglassDate }}</strong>
-          </div>
-          <div class="form-inline">
-            <label>
-              Mystic Hourglasses:
-              <input
-                v-model="hero.purchased.plan.consecutive.trinkets"
-                class="form-control"
-                type="number"
-                min="0"
-                step="1"
-              >
-            </label>
-          </div>
-          <div>
-            Gem cap:
-            <strong>{{ hero.purchased.plan.consecutive.gemCapExtra + 25 }}</strong>
-          </div>
-          <div class="form-inline">
-            <label>
-              Gems bought this month:
-              <input
-                v-model="hero.purchased.plan.gemsBought"
-                class="form-control"
-                type="number"
-                min="0"
-                :max="hero.purchased.plan.consecutive.gemCapExtra + 25"
-                step="1"
-              >
-            </label>
-          </div>
+        <div>
+          Next Mystic Hourglass:
+          <strong>{{ nextHourglassDate }}</strong>
+        </div>
+        <div class="form-inline">
+          <label>
+            Mystic Hourglasses:
+            <input
+              v-model="hero.purchased.plan.consecutive.trinkets"
+              class="form-control"
+              type="number"
+              min="0"
+              step="1"
+            >
+          </label>
+        </div>
+        <div class="form-inline">
+          <label>
+            Gem cap increase:
+            <input
+              v-model="hero.purchased.plan.consecutive.gemCapExtra"
+              class="form-control"
+              type="number"
+              min="0"
+              max="25"
+              step="5"
+            >
+          </label>
+        </div>
+        <div>
+          Total Gem cap:
+          <strong>{{ Number(hero.purchased.plan.consecutive.gemCapExtra) + 25 }}</strong>
+        </div>
+        <div class="form-inline">
+          <label>
+            Gems bought this month:
+            <input
+              v-model="hero.purchased.plan.gemsBought"
+              class="form-control"
+              type="number"
+              min="0"
+              :max="hero.purchased.plan.consecutive.gemCapExtra + 25"
+              step="1"
+            >
+          </label>
+        </div>
         <div
           v-if="hero.purchased.plan.extraMonths > 0"
         >
@@ -139,13 +152,6 @@ export default {
       return currentPlanContext.nextHourglassDate.format('MMMM');
     },
   },
-  watch: {
-    'hero.purchased.plan.consecutive.count' () { // eslint-disable-line object-shorthand
-      this.hero.purchased.plan.consecutive.gemCapExtra = Math.min(
-        Math.floor(this.hero.purchased.plan.consecutive.count / 3) * 5, 25,
-      );
-    },
-  },
   methods: {
     dateFormat (date) {
       return moment(date).format('YYYY/MM/DD');