Move Password field below New Email field so we have some consistency across these similar forms.