Let's sort the right user
Fix room switching