diff --git a/test/api/v3/integration/tasks/POST-tasks_user.test.js b/test/api/v3/integration/tasks/POST-tasks_user.test.js
index f720c8e023..729619037b 100644
--- a/test/api/v3/integration/tasks/POST-tasks_user.test.js
+++ b/test/api/v3/integration/tasks/POST-tasks_user.test.js
@@ -131,7 +131,7 @@ describe('POST /tasks/user', () => {
       expect(task.updatedAt).not.to.equal('tomorrow');
       expect(task.challenge).not.to.equal('no');
       expect(task.completed).to.equal(false);
-      expect(task.streak).not.to.equal('never');
+      expect(task.dateCompleted).not.to.equal('never');
       expect(task.value).not.to.equal(324);
       expect(task.yesterDaily).to.equal(true);
     });
diff --git a/website/client/components/payments/buyGemsModal.vue b/website/client/components/payments/buyGemsModal.vue
index d160157303..f94db5408b 100644
--- a/website/client/components/payments/buyGemsModal.vue
+++ b/website/client/components/payments/buyGemsModal.vue
@@ -81,80 +81,87 @@
             .col-6.offset-3 {{ $t('buyGemsSupportsDevs') }}
 
         div(v-show='selectedPage === "subscribe"')
-          .row.text-center
-            h2.mx-auto.text-leadin {{ $t('subscriptionBenefitLeadin') }}
-          .row
-            .col
-              +featureBullet("{{ $t('subscriptionBenefit1') }}")
-              +featureBullet("{{ $t('subscriptionBenefit2') }}")
-              +featureBullet("{{ $t('subscriptionBenefit3') }}")
-            .col
-              +featureBullet("{{ $t('subscriptionBenefit4') }}")
-              +featureBullet("{{ $t('subscriptionBenefit5') }}")
-              +featureBullet("{{ $t('subscriptionBenefit6') }}")
-          .card-deck
-            .card.text-center
-              .card-body
-                .subscription-price
-                  span.superscript $
-                  span 4
-                  span.superscript.muted .99
-                .small {{ $t('everyMonth') }}
-                .divider
-                p.benefits(v-markdown='$t("earnGemsMonthly", {cap:25})')
-                .spacer
-                button.btn.btn-primary {{ $t('select') }}
-            .card.text-center
-              .card-body
-                .subscription-price
-                  span.superscript $
-                  span 14
-                  span.superscript.muted .99
-                .small {{ $t('everyXMonths', {interval: 3}) }}
-                .divider
-                p.benefits(v-markdown='$t("earnGemsMonthly", {cap:30})')
-                p.benefits(v-markdown='$t("receiveMysticHourglass")')
-                button.btn.btn-primary {{ $t('select') }}
-            .card.text-center
-              .card-body
-                .subscription-price
-                  span.superscript $
-                  span 29
-                  span.superscript.muted .99
-                .small {{ $t('everyXMonths', {interval: 6}) }}
-                .divider
-                p.benefits(v-markdown='$t("earnGemsMonthly", {cap:35})')
-                p.benefits(v-markdown='$t("receiveMysticHourglasses", {amount:2})')
-                button.btn.btn-primary {{ $t('select') }}
-            .card.text-center
-              .card-body
-                .subscription-price
-                  span.superscript $
-                  span 47
-                  span.superscript.muted .99
-                .small {{ $t('everyYear') }}
-                .divider
-                p.benefits(v-markdown='$t("earnGemsMonthly", {cap:45})')
-                p.benefits(v-markdown='$t("receiveMysticHourglasses", {amount:4})')
-                button.btn.btn-primary {{ $t('select') }}
-          .row.text-center
-            h2.mx-auto.text-payment {{ $t('choosePaymentMethod') }}
-          .row.text-center
-            a.mx-auto {{ $t('haveCouponCode') }}
-          .card-deck
-            .card.text-center.payment-method
-              .card-body(@click='showStripe({})')
-                .mx-auto(v-html='icons.creditCard', style='"height: 56px; width: 159px; margin-top: 1em;"')
-            .card.text-center.payment-method
-              a.card-body.paypal(:href='paypalCheckoutLink', target='_blank')
-                img(src='~assets/images/paypal.png')
-            .card.text-center.payment-method
-              .card-body.amazon(@click="amazonPaymentsInit({type: 'single'})")
-                img(src='~assets/images/amazon-payments.png')
-          .row.text-center
-            .svg-icon.mx-auto(v-html='icons.heart', style='"height: 24px; width: 24px;"')
-          .row.text-center.text-outtro
-            .col-6.offset-3 {{ $t('subscribeSupportsDevs') }}
+          div(v-if='hasSubscription')
+            .row.text-center
+              h2.mx-auto.text-leadin {{ $t('subscriptionAlreadySubscribedLeadIn') }}
+            .row.text-center
+              .col
+                p(v-html='$t("subscriptionAlreadySubscribed1")')
+          div(v-if='!hasSubscription')
+            .row.text-center
+              h2.mx-auto.text-leadin {{ $t('subscriptionBenefitLeadin') }}
+            .row
+              .col
+                +featureBullet("{{ $t('subscriptionBenefit1') }}")
+                +featureBullet("{{ $t('subscriptionBenefit2') }}")
+                +featureBullet("{{ $t('subscriptionBenefit3') }}")
+              .col
+                +featureBullet("{{ $t('subscriptionBenefit4') }}")
+                +featureBullet("{{ $t('subscriptionBenefit5') }}")
+                +featureBullet("{{ $t('subscriptionBenefit6') }}")
+            .card-deck
+              .card.text-center
+                .card-body
+                  .subscription-price
+                    span.superscript $
+                    span 4
+                    span.superscript.muted .99
+                  .small {{ $t('everyMonth') }}
+                  .divider
+                  p.benefits(v-markdown='$t("earnGemsMonthly", {cap:25})')
+                  .spacer
+                  button.btn.btn-primary {{ $t('select') }}
+              .card.text-center
+                .card-body
+                  .subscription-price
+                    span.superscript $
+                    span 14
+                    span.superscript.muted .99
+                  .small {{ $t('everyXMonths', {interval: 3}) }}
+                  .divider
+                  p.benefits(v-markdown='$t("earnGemsMonthly", {cap:30})')
+                  p.benefits(v-markdown='$t("receiveMysticHourglass")')
+                  button.btn.btn-primary {{ $t('select') }}
+              .card.text-center
+                .card-body
+                  .subscription-price
+                    span.superscript $
+                    span 29
+                    span.superscript.muted .99
+                  .small {{ $t('everyXMonths', {interval: 6}) }}
+                  .divider
+                  p.benefits(v-markdown='$t("earnGemsMonthly", {cap:35})')
+                  p.benefits(v-markdown='$t("receiveMysticHourglasses", {amount:2})')
+                  button.btn.btn-primary {{ $t('select') }}
+              .card.text-center
+                .card-body
+                  .subscription-price
+                    span.superscript $
+                    span 47
+                    span.superscript.muted .99
+                  .small {{ $t('everyYear') }}
+                  .divider
+                  p.benefits(v-markdown='$t("earnGemsMonthly", {cap:45})')
+                  p.benefits(v-markdown='$t("receiveMysticHourglasses", {amount:4})')
+                  button.btn.btn-primary {{ $t('select') }}
+            .row.text-center
+              h2.mx-auto.text-payment {{ $t('choosePaymentMethod') }}
+            .row.text-center
+              a.mx-auto {{ $t('haveCouponCode') }}
+            .card-deck
+              .card.text-center.payment-method
+                .card-body(@click='showStripe({})')
+                  .mx-auto(v-html='icons.creditCard', style='"height: 56px; width: 159px; margin-top: 1em;"')
+              .card.text-center.payment-method
+                a.card-body.paypal(:href='paypalCheckoutLink', target='_blank')
+                  img(src='~assets/images/paypal.png')
+              .card.text-center.payment-method
+                .card-body.amazon(@click="amazonPaymentsInit({type: 'single'})")
+                  img(src='~assets/images/amazon-payments.png')
+            .row.text-center
+              .svg-icon.mx-auto(v-html='icons.heart', style='"height: 24px; width: 24px;"')
+            .row.text-center.text-outtro
+              .col-6.offset-3 {{ $t('subscribeSupportsDevs') }}
 </template>
 
 <style lang="scss">
@@ -340,6 +347,9 @@
       startingPageOption () {
         return this.$store.state.gemModalOptions.startingPage;
       },
+      hasSubscription () {
+        return Boolean(this.user.purchased.plan.customerId);
+      },
       userReachedGemCap () {
         return this.user.purchased.plan.customerId && this.user.purchased.plan.gemsBought >= this.user.purchased.plan.consecutive.gemCapExtra + this.planGemLimits.convCap;
       },
diff --git a/website/client/components/settings/subscription.vue b/website/client/components/settings/subscription.vue
index a8bb7b8dae..ac9c7d08ca 100644
--- a/website/client/components/settings/subscription.vue
+++ b/website/client/components/settings/subscription.vue
@@ -32,7 +32,7 @@
           tr(v-if='hasCanceledSubscription'): td.alert.alert-warning
             span.noninteractive-button.btn-danger {{ $t('canceledSubscription') }}
             i.glyphicon.glyphicon-time
-            |  {{ $t('subCanceled') }}
+            |  {{ $t('subCanceled') }} &nbsp;
             strong {{user.purchased.plan.dateTerminated | date}}
           tr(v-if='!hasCanceledSubscription'): td
             h4 {{ $t('subscribed') }}
@@ -46,7 +46,7 @@
             | &nbsp; {{ $t('consecutiveSubscription') }}
             ul.list-unstyled
               li {{ $t('consecutiveMonths') }} {{user.purchased.plan.consecutive.count + user.purchased.plan.consecutive.offset}}
-              li {{ $t('gemCapExtra') }}} {{user.purchased.plan.consecutive.gemCapExtra}}
+              li {{ $t('gemCapExtra') }} {{user.purchased.plan.consecutive.gemCapExtra}}
               li {{ $t('mysticHourglasses') }} {{user.purchased.plan.consecutive.trinkets}}
 
         div(v-if='!hasSubscription || hasCanceledSubscription')
@@ -147,7 +147,8 @@ export default {
   filters: {
     date (value) {
       if (!value) return '';
-      return moment(value).formate(this.user.preferences.dateFormat);
+      return moment(value);
+      // return moment(value).format(this.user.preferences.dateFormat); // @TODO make that work (`TypeError: this is undefined`)
     },
   },
   computed: {
@@ -156,6 +157,7 @@ export default {
       let couponString = '';
       if (this.subscription.coupon) couponString = `&coupon=${this.subscription.coupon}`;
       return `/paypal/subscribe?_id=${this.user._id}&apiToken=${this.user.apiToken}&sub=${this.subscription.key}${couponString}`;
+      // @TODO don't put API Token in URL parameters
     },
     subscriptionBlocksOrdered () {
       let subscriptions = filter(subscriptionBlocks, (o) => {
diff --git a/website/client/components/static/home.vue b/website/client/components/static/home.vue
index 055a5f0062..bdc6158cd6 100644
--- a/website/client/components/static/home.vue
+++ b/website/client/components/static/home.vue
@@ -23,7 +23,7 @@
             .strike
               span OR
             .form
-              input.form-control(type='text', placeholder='Username', v-model='username', :class='{"input-valid": username.length > 0}')
+              input.form-control(type='text', placeholder='Login Name', v-model='username', :class='{"input-valid": username.length > 0}')
               input.form-control(type='email', placeholder='Email', v-model='email', :class='{"input-invalid": emailInvalid, "input-valid": emailValid}')
               input.form-control(type='password', placeholder='Password', v-model='password', :class='{"input-valid": password.length > 0}')
               input.form-control(type='password', placeholder='Confirm Password', v-model='passwordConfirm', :class='{"input-invalid": passwordConfirmInvalid, "input-valid": passwordConfirmValid}')
diff --git a/website/client/components/tasks/taskModal.vue b/website/client/components/tasks/taskModal.vue
index 35ce2389c7..edb7339b91 100644
--- a/website/client/components/tasks/taskModal.vue
+++ b/website/client/components/tasks/taskModal.vue
@@ -117,7 +117,7 @@
               span.custom-control-indicator
               span.custom-control-description {{ $t('dayOfWeek') }}
 
-        .option
+        .option(v-if="task.userId")
           label(v-once) {{ $t('tags') }}
           .category-wrap(@click="showTagsSelect = !showTagsSelect")
             span.category-select(v-if='task.tags && task.tags.length === 0') {{$t('none')}}
@@ -135,12 +135,18 @@
                     span.custom-control-description(v-once) {{ tag.name }}
               .row
                 button.btn.btn-primary(@click="showTagsSelect = !showTagsSelect") {{$t('close')}}
+
         .option(v-if="task.type === 'habit'")
           label(v-once) {{ $t('resetStreak') }}
           b-dropdown(:text="$t(task.frequency)")
             b-dropdown-item(v-for="frequency in ['daily', 'weekly', 'monthly']", :key="frequency", @click="task.frequency = frequency", :class="{active: task.frequency === frequency}")
               | {{ $t(frequency) }}
 
+        .option(v-if="task.type === 'daily' && task.userId")
+          .form-group
+            label(v-once) {{ $t('restoreStreak') }}
+            input(type="number", v-model="task.streak", min="0", required)
+
         .option.group-options(v-if='groupId')
           label(v-once) Assigned To
           .category-wrap(@click="showAssignedSelect = !showAssignedSelect")
diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index 04f2de614e..86e9a3b908 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -39,7 +39,7 @@
     "manageSub": "Click to manage subscription",
     "cancelSub": "Cancel Subscription",
     "cancelSubInfoGoogle": "Please go to the \"Account\" > \"Subscriptions\" section of the Google Play Store app to cancel your subscription or to see your subscription's termination date if you have already cancelled it. This screen is not able to show you whether your subscription has been cancelled.",
-    "cancelSubInfoApple": "Please follow <a href=\"https://support.apple.com/en-us/HT202039\">Apple’s official instructions</a> to cancel your subscription or to see your subscription's termination date if you have already cancelled it. This screen is not able to show you whether your subscription has been cancelled.",
+    "cancelSubInfoApple": "Please follow <a href=\"https://support.apple.com/en-us/HT202039\">Apple's official instructions</a> to cancel your subscription or to see your subscription's termination date if you have already cancelled it. This screen is not able to show you whether your subscription has been cancelled.",
     "canceledSubscription": "Canceled Subscription",
     "cancelingSubscription": "Canceling the subscription",
     "adminSub": "Administrator Subscriptions",
@@ -199,5 +199,7 @@
     "subscriptionBenefit5": "Receive the exclusive Royal Purple Jackalope pet!",
     "subscriptionBenefit6": "Earn Mystic Hourglasses for use in the Time Travelers' Shop!",
     "haveCouponCode": "Do you have a coupon code?",
+    "subscriptionAlreadySubscribedLeadIn": "Thanks for subscribing!",
+    "subscriptionAlreadySubscribed1": "To see your subscription details and cancel, renew, or change your subscription, please go to <a href='/user/settings/subscription'>User icon &gt; Settings &gt; Subscription</a>.",
     "purchaseAll": "Purchase All"
 }