diff --git a/src/app/party.coffee b/src/app/party.coffee
index 9ea816407a..f40df7fce9 100644
--- a/src/app/party.coffee
+++ b/src/app/party.coffee
@@ -14,7 +14,7 @@ module.exports.app = (exports, model) ->
 
   exports.partyCreate = ->
     newParty = model.get("_newParty")
-    id = model.add 'parties', { name: newParty, leader: user.get('id'), members: [], invites: [] }
+    id = model.add 'parties', { name: newParty, leader: user.get('id'), members: [user.get('id')] }
     user.set 'party', {current: id, invitation: null, leader: true}
 
   exports.partyInvite = ->
@@ -55,7 +55,12 @@ module.exports.app = (exports, model) ->
     user.set 'party.current', null
     members = model.get ("parties.#{id}.members")
     index = members.indexOf(user.get('id'))
-    model.set "parties.#{id}.members", members.slice(index)
+    newMembers = members.slice(index)
+    if (newMembers.length == 0)
+      # last member out, kill the party
+      model.del "parties.#{id}"
+    else
+      model.set "parties.#{id}.members", members.slice(index)
     window.location.reload()
 
   exports.partyDisband = ->
diff --git a/views/app/index.html b/views/app/index.html
index 4ebdb3fa9d..11124cdf2e 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -120,9 +120,11 @@
 
     {#if _user.party.current}
         <!-- In a party -->
+        <ul>
         {#each _partyMembers as :member}
-            {:member.id}
+            <li>{username(:member.auth)}</li>
         {/}
+        </ul>
         <form x-bind="submit: partyInvite">
           {#if _view.partyError}
             <div class='alert alert-danger'>{_view.partyError}</div>
@@ -231,13 +233,15 @@
               <!-- Party -->
               {#if _party}
                   {#each _partyMembers as :member}
-                    <td class="avatar party-avatar" rel="tooltip" title="{username(:member.auth)}" data-placement="bottom" >
-                        <div class='avatar-sprites'>
-                            <img class='weapon weapon-{:member.items.weapon}' src="/img/BrowserQuest/habitrpg_mods/weapon{:member.items.weapon}.png" />
-                            <img class='armor armor-{:member.items.armor}' src="/img/BrowserQuest/habitrpg_mods/{currentArmor(:member)}" />
-                        </div>
-                        <div id="lvl"><span class="badge badge-info">Lvl {:member.stats.lvl}</span></div>
-                    </td>
+                    {#unless equal(:member.id, _userId)}
+                        <td class="avatar party-avatar" rel="tooltip" title="{username(:member.auth)}" data-placement="bottom" >
+                            <div class='avatar-sprites'>
+                                <img class='weapon weapon-{:member.items.weapon}' src="/img/BrowserQuest/habitrpg_mods/weapon{:member.items.weapon}.png" />
+                                <img class='armor armor-{:member.items.armor}' src="/img/BrowserQuest/habitrpg_mods/{currentArmor(:member)}" />
+                            </div>
+                            <div id="lvl"><span class="badge badge-info">Lvl {:member.stats.lvl}</span></div>
+                        </td>
+                    {/}
                   {/}
               {/}