Added no password option and password confirmation