diff --git a/website/public/js/controllers/settingsCtrl.js b/website/public/js/controllers/settingsCtrl.js
index ed9ac730f1..e785c7c02e 100644
--- a/website/public/js/controllers/settingsCtrl.js
+++ b/website/public/js/controllers/settingsCtrl.js
@@ -204,12 +204,13 @@ habitrpg.controller('SettingsCtrl',
 
     $scope.gemGoldCap = function(subscription) {
       var baseCap = 25;
+      var gemCapIncrement = 5;
+      var capIncrementThreshold = 3;
       var gemCapExtra = User.user.purchased.plan.consecutive.gemCapExtra;
-      // @TODO: What are these magic numbers? 3? 5?
-      var blocks = Content.subscriptionBlocks[subscription.key].months / 3 * 5;
+      var blocks = Content.subscriptionBlocks[subscription.key].months / capIncrementThreshold;
       var flooredBlocks = Math.floor(blocks);
 
-      var userTotalDropCap = baseCap + gemCapExtra + flooredBlocks;
+      var userTotalDropCap = baseCap + gemCapExtra + flooredBlocks * gemCapIncrement;
       var maxDropCap = 50;
 
       return [userTotalDropCap, maxDropCap];
diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade
index 9a0808b2eb..43e1c17608 100644
--- a/website/views/options/settings.jade
+++ b/website/views/options/settings.jade
@@ -269,7 +269,7 @@ mixin subPerks()
     tr
       td
         span.hint(popover=env.t('buyGemsGoldText', {gemCost: "{{Shared.planGemLimits.convRate}}", gemLimit: "{{Shared.planGemLimits.convCap}}"}),popover-trigger='mouseenter',popover-placement='right') #{env.t('buyGemsGold')} 
-        span.badge.badge-success(ng-show='_subscription.key!="basic_earned"')=env.t('buyGemsGoldCap', {amount: '{{:: gemGoldCap(_subscription)  | min }}'})
+        span.badge.badge-success(ng-show='_subscription.key!="basic_earned"')=env.t('buyGemsGoldCap', {amount: '{{gemGoldCap(_subscription)  | min }}'})
     tr
       td
         span.hint(popover=env.t('retainHistoryText'),popover-trigger='mouseenter',popover-placement='right')=env.t('retainHistory')
@@ -280,7 +280,7 @@ mixin subPerks()
       td
         span.hint(popover=env.t('mysteryItemText'),popover-trigger='mouseenter',popover-placement='right') #{env.t('mysteryItem')} 
         div(ng-show='_subscription.key!="basic_earned"')
-          .badge.badge-success=env.t('mysticHourglass', {amount: '+{{:: numberOfMysticHourglasses(_subscription)}}'})
+          .badge.badge-success=env.t('mysticHourglass', {amount: '+{{numberOfMysticHourglasses(_subscription)}}'})
           .small.muted=env.t('mysticHourglassText')
     tr
       td