edited user to allow user pulling to work correctly