Setting organisation-id in db to be the shortname (these have to be unique anyways)