Minor change - moving set_up_user