diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json
index 4d8ea0716c..76d1cf7837 100644
--- a/common/locales/en/groups.json
+++ b/common/locales/en/groups.json
@@ -36,7 +36,7 @@
     "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?",
     "joinNewParty": "Join New Party",
     "declineInvitation": "Decline Invitation",
-    "loadingNewParty": "Your new party is loading. Please wait...",
+    "loadingNewParty": "Your party is loading. Please wait...",
     "newMsg": "New message in \"<%= name %>\"",
     "chat": "Chat",
     "sendChat": "Send Chat",
diff --git a/website/client/js/controllers/partyCtrl.js b/website/client/js/controllers/partyCtrl.js
index d1981b643e..3bbdff1d54 100644
--- a/website/client/js/controllers/partyCtrl.js
+++ b/website/client/js/controllers/partyCtrl.js
@@ -20,7 +20,8 @@ habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','
         $rootScope.party = $scope.group = $scope.newGroup = { type: 'party' };
       }
 
-      if ($state.is('options.social.party')) {
+      if ($state.is('options.social.party') && $rootScope.party) {
+        $scope.group = {loadingParty: true}
         Groups.party(true).then(handlePartyResponse, handlePartyError);
       } else {
         Groups.Group.syncParty().then(handlePartyResponse, handlePartyError);
@@ -47,6 +48,8 @@ habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','
       }
 
       $scope.create = function(group) {
+        group.loadingParty = true;
+
         if (!group.name) group.name = env.t('possessiveParty', {name: User.user.profile.name});
         Groups.Group.create(group)
           .then(function(response) {
@@ -141,7 +144,7 @@ habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','
           Groups.Group.leave(Groups.data.party._id, false)
             .then(function() {
               $rootScope.party = $scope.group = {
-                loadingNewParty: true
+                loadingParty: true
               };
               $scope.join({ id: newPartyId, name: newPartyName });
             });
diff --git a/website/views/options/social/party.jade b/website/views/options/social/party.jade
index 6f0229152d..ed3fe9189b 100644
--- a/website/views/options/social/party.jade
+++ b/website/views/options/social/party.jade
@@ -1,13 +1,13 @@
 include ../../shared/avatar/generated_avatar
 
 script(type='text/ng-template', id='partials/options.social.party.html')
-  div(ng-if='group.loadingNewParty')
+  div(ng-if='group.loadingParty')
     include ./party/loading-new-party
 
   div(ng-if='group._id')
     include ./party/leave-party-and-join-another
     include ./group
 
-  div(ng-if='!group._id && !group.loadingNewParty')
+  div(ng-if='!group._id && !group.loadingParty')
     include ./party/party-invitation
     include ./party/start-a-party
diff --git a/website/views/options/social/party/start-a-party.jade b/website/views/options/social/party/start-a-party.jade
index 49d9768b2d..b6946ed0aa 100644
--- a/website/views/options/social/party/start-a-party.jade
+++ b/website/views/options/social/party/start-a-party.jade
@@ -19,5 +19,5 @@
 
   .row.row-margin
     .btn.btn-primary(ng-click='inviteOrStartParty(group)')=env.t('inviteFriendsNow')
-    .btn.btn-default(ng-click='create(newGroup); group.loadingNewParty = true')=env.t('inviteFriendsLater')
+    .btn.btn-default(ng-click='create(newGroup)')=env.t('inviteFriendsLater')
     .btn.btn-default(ng-click='openModal("user-id",{track:"Join Existing Party"})')=env.t('joinExistingParty')