Squashed get_user PR