#7: add missing templates for password change

fix password change form fields order, too