Added password and password confirm fields