diff --git a/src/app/party.coffee b/src/app/party.coffee
index fe5f795277..30592b5557 100644
--- a/src/app/party.coffee
+++ b/src/app/party.coffee
@@ -71,8 +71,7 @@ module.exports.partySubscribe = partySubscribe = (page, model, params, next, cb)
 module.exports.app = (appExports, model) ->
   user = model.at('_user')
 
-  user.on 'set', 'flags.partyEnabled', (captures, args) ->
-    return unless captures == true
+  unlockPartiesNotification = ->
     $('.main-avatar').popover('destroy') #remove previous popovers
     html = """
            <div class='party-system-popover'>
@@ -89,6 +88,14 @@ module.exports.app = (appExports, model) ->
       content: html
     $('.main-avatar').popover 'show'
 
+  appExports.manuallyUnlockParties = ->
+    $("#settings-modal").modal("hide")
+    user.set('flags.partyEnabled', true)
+    unlockPartiesNotification()
+
+  user.on 'set', 'flags.partyEnabled', (captures, args) ->
+    unlockPartiesNotification() if captures == true
+
   #TODO implement this when we have unsubscribe working properly
   model.on 'set', '_user.party.invitation', (after, before) ->
     if !before? and after? # they just got invited
diff --git a/views/app/settings.html b/views/app/settings.html
index 6bdd3b06c4..5ac441c627 100644
--- a/views/app/settings.html
+++ b/views/app/settings.html
@@ -18,8 +18,9 @@
                     </div>
 
                     <hr/>
-                    <h4>Toggle Header</h4>
-                    <button x-bind="click:toggleHeader">{#if _user.preferences.hideHeader}Show{else}Hide{/}</button>
+                    <h4>Misc</h4>
+                    <button x-bind="click:toggleHeader">{#if _user.preferences.hideHeader}Show Header{else}Hide Header{/}</button>
+                    {#unless _user.flags.partyEnabled}&nbsp;<button x-bind="click:manuallyUnlockParties" data-dismiss='modal' rel=tooltip title="Parties are unlocked automatically for usability reasons, but you can override that here.">Enable Parties</button>{/}
 
                     {{#if _user.auth.local}}
                         <hr/>