moved password and password confirmation field in xml