Use the correct attribute name on form declarations. Closes habari/habari#529
Merge branch 'master' into 766