Revert the change from 3493 -- move Password field back below New User Name field.