Fix form submission using collection_select
Merge branch 'email-functionality-2'