Relates to issue #9.
Should fix issue number #10, the user list not in sync.