diff --git a/website/client-old/js/services/questServices.js b/website/client-old/js/services/questServices.js
index 6a1c5fe765..2e032b76a2 100644
--- a/website/client-old/js/services/questServices.js
+++ b/website/client-old/js/services/questServices.js
@@ -35,10 +35,6 @@ angular.module('habitrpg')
         alert(window.env.t('mustLvlQuest', {level: quest.lvl}))
         return 'mustLvlQuest';
       }
-
-      if (quest.unlockCondition && quest.unlockCondition.condition === 'create account') {
-
-      }
     }
 
     function buyQuest(quest) {
@@ -50,18 +46,12 @@ angular.module('habitrpg')
           return reject(preventQuestModal);
         }
 
-        if (item.unlockCondition && item.unlockCondition.condition === 'party invite') {
-          if (!confirm(window.env.t('mustInviteFriend'))) return reject('Did not want to invite friends');
-          Groups.inviteOrStartParty(party)
-          return reject('Invite or start party');
-        }
-
-        if (item.unlockCondition && item.unlockCondition.condition === 'create account') {
+        if (item.unlockCondition && quest === 'dustbunnies') {
           alert(window.env.t('createAccountQuest'));
           return reject('Awarded to new accounts');
         }
 
-        if (item.unlockCondition && item.unlockCondition.condition === 'login incentive') {
+        if (item.unlockCondition && (quest === 'moon1' || quest === 'moon2' || quest === 'moon3')) {
           if (user.loginIncentives > item.unlockCondition.incentiveThreshold) {
             alert(window.env.t('loginIncentiveQuestObtained', {count: item.unlockCondition.incentiveThreshold}));
           } else {
@@ -70,6 +60,12 @@ angular.module('habitrpg')
           return reject('Login incentive item');
         }
 
+        if (item.unlockCondition && item.unlockCondition.condition === 'party invite') {
+          if (!confirm(window.env.t('mustInviteFriend'))) return reject('Did not want to invite friends');
+          Groups.inviteOrStartParty(party)
+          return reject('Invite or start party');
+        }
+
         resolve(item);
       });
     }
diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js
index e80ec19502..6c2628ffc0 100644
--- a/website/common/script/content/index.js
+++ b/website/common/script/content/index.js
@@ -2661,7 +2661,7 @@ api.quests = {
     value: 4,
     category: 'unlockable',
     unlockCondition: {
-      condition: 'create account',
+      condition: 'party invite',
       text: t('createAccountReward')
     },
     boss: {
@@ -2681,7 +2681,7 @@ api.quests = {
     value: 4,
     category: 'unlockable',
     unlockCondition: {
-      condition: 'login incentive',
+      condition: 'party invite',
       incentiveThreshold: 7,
       text: t('loginReward', {count: 7})
     },
@@ -2711,7 +2711,7 @@ api.quests = {
     value: 4,
     category: 'unlockable',
     unlockCondition: {
-      condition: 'login incentive',
+      condition: 'party invite',
       incentiveThreshold: 22,
       text: t('loginReward', {count: 22})
     },
@@ -2740,7 +2740,7 @@ api.quests = {
     value: 4,
     category: 'unlockable',
     unlockCondition: {
-      condition: 'login incentive',
+      condition: 'party invite',
       incentiveThreshold: 40,
       text: t('loginReward', {count: 40})
     },
diff --git a/website/common/script/libs/shops.js b/website/common/script/libs/shops.js
index fadd2b7a3b..8b1b5e8513 100644
--- a/website/common/script/libs/shops.js
+++ b/website/common/script/libs/shops.js
@@ -7,7 +7,7 @@ let shops = {};
 
 function lockQuest (quest, user) {
   if (quest.lvl && user.stats.lvl < quest.lvl) return true;
-  if (quest.unlockCondition && quest.unlockCondition.condition === 'login incentive') {
+  if (quest.unlockCondition && (quest.key === 'moon1' || quest.key === 'moon2' || quest.key === 'moon3')) {
     return user.loginIncentives < quest.unlockCondition.incentiveThreshold;
   }
   if (user.achievements.quests) return quest.previous && !user.achievements.quests[quest.previous];