removed the need for a password when creating an account
resolved merge conflict