Updated with review comments
Fixed issue with creating new user