Updated get_user_as_dict to conform to the new database structure.
Automerge