Fixed organization editing
Merge pull request #271 from dswd/fix-organization-edit

Fixed organization editing