Make change password forms consistent with UX refs openhealthcare/elcid#336