Modified how create user works