diff --git a/src/app/groups.coffee b/src/app/groups.coffee
index e24f59abe7..d8222c7b36 100644
--- a/src/app/groups.coffee
+++ b/src/app/groups.coffee
@@ -72,7 +72,7 @@ module.exports.app = (appExports, model, app) ->
   joinGroup = (gid) ->
     model.push("groups.#{gid}.members", user.get('id'), ->location.reload())
 
-  appExports.joingGroup = (e, el) -> joinGroup e.get('id')
+  appExports.joinGroup = (e, el) -> joinGroup e.get('id')
 
   appExports.acceptInvitation = (e,el) ->
     gid = e.get('id')
@@ -89,13 +89,12 @@ module.exports.app = (appExports, model, app) ->
 
   appExports.groupLeave = (e,el) ->
     group = model.at "groups.#{$(el).attr('data-id')}"
-    members = group.get('members')
-    index = members.indexOf(user.get('id'))
-    group.remove 'members', index, 1, ->
-      if members.length is 1 # # last member out, kill the party
-        group.del ->location.reload()
-      else
-        location.reload()
+    index = group.get('members').indexOf(user.get('id'))
+    if index != -1
+      group.remove 'members', index, 1, ->
+        if _.isEmpty group.get('members') # last member out, delete the party
+          group.del ->location.reload()
+        else location.reload()
 
   ###
     Chat Functionality
diff --git a/views/app/groups.html b/views/app/groups.html
index 57383870f2..e9a68495ca 100644
--- a/views/app/groups.html
+++ b/views/app/groups.html
@@ -70,8 +70,11 @@
                     <li>{{count(:public.members)}} member(s)</li>
                     <li>
                         <!-- join / leave -->
-                        <a x-bind="click:publicLeave" data-id={{:public.id}} class='btn btn-small btn-danger {#if indexOf(:public.members,@user.id)}hidden{/}'><i class='icon-ban-circle'></i> Leave</a>
-                        <a x-bind="click:joinGroup" class='btn btn-small btn-success {#unless indexOf(:public.members,@user.id)}hidden{/}'><i class='icon-ok'></i> Join</a>
+                        {{#if indexOf(:public.members,_user.id)}}
+                            <a x-bind="click:groupLeave" data-id={{:public.id}} class='btn btn-small btn-danger'><i class='icon-ban-circle'></i> Leave</a>
+                        {{else}}
+                            <a x-bind="click:joinGroup" class='btn btn-small btn-success'><i class='icon-ok'></i> Join</a>
+                        {{/}}
                     </li>
                 </ul>
                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#public-guilds-accordion" href="#public-guilds-accordion-{{:public.id}}">