Seem to have fixed the bug where 1 user becomes 2