[#1281] DefaultOrganizationForm instead of hard-coded values in controller

Attempted fix for #1281

Lightly tested.