Merge "Changing the process to create a new user"