Actually pass the addon to the form (bug 892694)

The tests from commit c72ff7f2 should cover this.