Minor changes.
Changed the way we load users.