diff --git a/website/client/components/challenges/challengeModal.vue b/website/client/components/challenges/challengeModal.vue
index 0778e8a5f5..8f39632bad 100644
--- a/website/client/components/challenges/challengeModal.vue
+++ b/website/client/components/challenges/challengeModal.vue
@@ -124,7 +124,7 @@
     }
 
     .category-box {
-      top: -120px !important;
+      top: 20em !important;
       z-index: 10;
     }
   }
diff --git a/website/client/components/groups/group.vue b/website/client/components/groups/group.vue
index b312a3e093..3a51f7ee34 100644
--- a/website/client/components/groups/group.vue
+++ b/website/client/components/groups/group.vue
@@ -539,7 +539,7 @@ export default {
       }
 
       if (this.isParty) {
-        await this.$store.dispatch('party:getParty');
+        await this.$store.dispatch('party:getParty', true);
         this.group = this.$store.state.party.data;
         this.checkForAchievements();
       } else {
@@ -599,10 +599,14 @@ export default {
       if (this.isParty) {
         data.type = 'party';
         Analytics.updateUser({partySize: null, partyID: null});
-        this.$store.state.party.members = [];
+        this.$store.state.partyMembers = [];
       }
 
       await this.$store.dispatch('guilds:leave', data);
+
+      if (this.isParty) {
+        this.$router.push({name: 'tasks'});
+      }
     },
     upgradeGroup () {
       this.$store.state.upgradingGroup = this.group;
diff --git a/website/client/components/groups/groupFormModal.vue b/website/client/components/groups/groupFormModal.vue
index 7098c93bf4..8e092aae4d 100644
--- a/website/client/components/groups/groupFormModal.vue
+++ b/website/client/components/groups/groupFormModal.vue
@@ -107,6 +107,10 @@
 <style lang="scss" scoped>
   @import '~client/assets/scss/colors.scss';
 
+  .custom-control-input {
+    z-index: 1 !important;
+  }
+
   .svg-icon {
     width: 16px;
   }
diff --git a/website/client/components/groups/questDetailsModal.vue b/website/client/components/groups/questDetailsModal.vue
index 217aefc95d..e025221025 100644
--- a/website/client/components/groups/questDetailsModal.vue
+++ b/website/client/components/groups/questDetailsModal.vue
@@ -134,7 +134,7 @@
 </style>
 
 <script>
-import { mapState } from 'client/libs/store';
+import { mapState, mapGetters } from 'client/libs/store';
 import quests from 'common/script/content/quests';
 
 import copyIcon from 'assets/svg/copy.svg';
@@ -173,7 +173,9 @@ export default {
   computed: {
     ...mapState({
       user: 'user.data',
-      partyMembers: 'partyMembers.data',
+    }),
+    ...mapGetters({
+      partyMembers: 'party:members',
     }),
     questData () {
       return quests.quests[this.group.quest.key];
diff --git a/website/client/components/header/index.vue b/website/client/components/header/index.vue
index 8ac13c048f..3f3602b862 100644
--- a/website/client/components/header/index.vue
+++ b/website/client/components/header/index.vue
@@ -125,16 +125,14 @@ export default {
   data () {
     return {
       expandedMember: null,
-
       currentWidth: 0,
     };
   },
   computed: {
     ...mapGetters({
       user: 'user:data',
-      partyMembers: 'partyMembers',
+      partyMembers: 'party:members',
     }),
-
     showHeader () {
       if (this.$store.state.hideHeader) return false;
       return true;
@@ -176,8 +174,10 @@ export default {
       }
     },
   },
-  created () {
-    if (this.user.party && this.user.party._id) this.getPartyMembers();
+  async created () {
+    if (this.user.party && this.user.party._id) {
+      await this.getPartyMembers(true);
+    }
   },
 };
 </script>
diff --git a/website/client/components/tasks/taskModal.vue b/website/client/components/tasks/taskModal.vue
index fa0f316777..2ff3327361 100644
--- a/website/client/components/tasks/taskModal.vue
+++ b/website/client/components/tasks/taskModal.vue
@@ -16,9 +16,9 @@
             :disabled="groupAccessRequiredAndOnPersonalPage || challengeAccessRequired"
           )
         .form-group
-          label.d-flex.align-items-center.justify-content-between(v-once) 
+          label.d-flex.align-items-center.justify-content-between(v-once)
             span {{ $t('notes') }}
-            small(v-once) 
+            small(v-once)
               a(target="_blank", href="http://habitica.wikia.com/wiki/Markdown_Cheat_Sheet") {{ $t('markdownHelpLink') }}
 
           textarea.form-control(v-model="task.notes", rows="3")
@@ -30,7 +30,7 @@
               .input-group-prepend.input-group-icon
                 .svg-icon.gold(v-html="icons.gold")
               input.form-control(type="number", v-model="task.value", required, placeholder="1.0", step="0.01", min="0")
-            
+
         .option.mt-0(v-if="checklistEnabled")
           label(v-once) {{ $t('checklist') }}
           br
@@ -151,7 +151,7 @@
         .option(v-if="task.type === 'habit'")
           .form-group
             label(v-once) {{ $t('resetStreak') }}
-            b-dropdown.inline-dropdown(:text="$t(task.frequency)")
+            b-dropdown.inline-dropdown(:text="$t(task.frequency)", :disabled='challengeAccessRequired')
               b-dropdown-item(v-for="frequency in ['daily', 'weekly', 'monthly']", :key="frequency", @click="task.frequency = frequency", :class="{active: task.frequency === frequency}")
                 | {{ $t(frequency) }}
 
@@ -226,7 +226,7 @@
 
               .option(v-if="isUserTask && task.type !== 'reward'")
                 .form-group
-                  label(v-once) 
+                  label(v-once)
                     span.float-left {{ $t('attributeAllocation') }}
                     .svg-icon.info-icon(v-html="icons.information", v-b-tooltip.hover.righttop.html="$t('attributeAllocationHelp')")
                   .attributes
diff --git a/website/client/store/actions/guilds.js b/website/client/store/actions/guilds.js
index 38dcfbfdd3..63b5fcc815 100644
--- a/website/client/store/actions/guilds.js
+++ b/website/client/store/actions/guilds.js
@@ -78,7 +78,8 @@ export async function leave (store, payload) {
     store.state.myGuilds.splice(guildIndex, 1);
   } else if (payload.type === 'party') {
     store.state.user.data.party._id = null;
-    store.state.party = {};
+    store.state.party.data = {};
+    store.state.party.status = 'NOT_LOADED';
   }
 
   return response.data.data;
diff --git a/website/client/store/actions/party.js b/website/client/store/actions/party.js
index bed6b9bb58..8a5dae62d1 100644
--- a/website/client/store/actions/party.js
+++ b/website/client/store/actions/party.js
@@ -22,4 +22,4 @@ export function getParty (store, forceLoad = false) {
     },
     forceLoad,
   });
-}
\ No newline at end of file
+}
diff --git a/website/client/store/getters/party.js b/website/client/store/getters/party.js
index cbe3f53246..24861a9d57 100644
--- a/website/client/store/getters/party.js
+++ b/website/client/store/getters/party.js
@@ -1,3 +1,3 @@
 export function members (store) {
   return store.state.partyMembers.data;
-}
\ No newline at end of file
+}