Keep better track of active users