[#252] Fixed
Merge pull request #253 from akvo/feature/252_Org_name