Put new password field into relevant forms

Plus: clean up registraion template a bit