diff --git a/spaceapi/utils.py b/spaceapi/utils.py
--- a/spaceapi/utils.py
+++ b/spaceapi/utils.py
@@ -109,12 +109,13 @@ class ActiveStatus(Singleton, dict):
                 people_now_present['value'] -= 1
 
             if 'names' in people_now_present:
-                if people_now_present['value'] == 0:
+
+                if username in people_now_present['names']:
+                    people_now_present['names'].remove(username)
+
+                if not people_now_present['names'] or people_now_present['value'] == 0:
                     del people_now_present['names']
-                elif username in people_now_present['names']:
-                    people_now_present['names'].remove(username)
-                    if not people_now_present['names']:
-                        del people_now_present['names']
+
             self['sensors']['people_now_present'][0] = people_now_present
         else:
             pass