diff --git a/website/views/options/social/quests/questNotActive.jade b/website/views/options/social/quests/questNotActive.jade
index 197e9c4cbd..3a55f3846f 100644
--- a/website/views/options/social/quests/questNotActive.jade
+++ b/website/views/options/social/quests/questNotActive.jade
@@ -1,9 +1,4 @@
 div(ng-if='group.quest.active==false')
-  span(ng-if='user.party.quest.RSVPNeeded')
-    // Buttons manually set RSVPNeeded to avoid synchronization errors
-    button.btn.btn-success(ng-click='party.$questAccept(); set({"party.quest.RSVPNeeded":false})')=env.t('accept')
-    button.btn.btn-danger(ng-click='party.$questReject(); set({"party.quest.RSVPNeeded":false})')=env.t('reject')
-    hr
   tabset
     tab(heading=env.t('invitations'))
       +participants(false)
@@ -25,5 +20,11 @@ div(ng-if='group.quest.active==false')
   .npc_ian.pull-left
   p=env.t('questStart')
 
-  button.btn.btn-sm.btn-warning(ng-if=':: group.quest.leader  && group.quest.leader==user._id && isMemberOfGroup(group.quest.leader,group) && isMemberOfPendingQuest(group.quest.leader,group)', ng-click='party.$questAccept({"force":true})')=env.t('begin')
-  button.btn.btn-sm.btn-danger(ng-if=':: (group.quest.leader  && group.quest.leader==user._id && isMemberOfGroup(group.quest.leader,group) && isMemberOfPendingQuest(group.quest.leader,group))', ng-click='questCancel(party)')=env.t('cancel')
+  span(ng-if='user.party.quest.RSVPNeeded')
+    // Buttons manually set RSVPNeeded to avoid synchronization errors
+    button.btn.btn-sm.btn-success(ng-click='party.$questAccept(); set({"party.quest.RSVPNeeded":false})')=env.t('accept')
+    button.btn.btn-sm.btn-danger(ng-click='party.$questReject(); set({"party.quest.RSVPNeeded":false})')=env.t('reject')
+
+  span(ng-if='::group.quest.leader  && group.quest.leader==user._id && isMemberOfGroup(group.quest.leader,group) && isMemberOfPendingQuest(group.quest.leader,group)')
+    button.btn.btn-sm.btn-warning(ng-click='party.$questAccept({"force":true})')=env.t('begin')
+    button.btn.btn-sm.btn-danger(ng-click='questCancel(party)')=env.t('cancel')