Revert "BUG FIX on address_form.tpl"
Merge pull request #7 from CoverUp/revert-1-patch-2

Revert "BUG FIX on address_form.tpl"