Fixed how users and uids are stored