moved new user logic back into model