Added additional required fields and removed custom password handling code.