Fixing bug when creating new organizations