Fixed tempalte/form registration