diff --git a/src/Controller/OrganisationController.php b/src/Controller/OrganisationController.php
index 63a3d23..9701015 100644
--- a/src/Controller/OrganisationController.php
+++ b/src/Controller/OrganisationController.php
@@ -87,12 +87,12 @@ class OrganisationController extends SimpleController
         $classMapper = $this->ci->classMapper;
 
         // Check if name or slug already exists
-        if ($classMapper->getClassMapping('organisation')::where('name', $data['name'])->first()) {
+        if ($classMapper->getClassMapping('organisation')::findUnique($data['name'], 'name')) {
             $ms->addMessageTranslated('danger', 'ORGANISATION.NAME.IN_USE', $data);
             $error = true;
         }
 
-        if ($classMapper->getClassMapping('organisation')::where('slug', $data['slug'])->first()) {
+        if ($classMapper->getClassMapping('organisation')::findUnique($data['slug'], 'slug')) {
             $ms->addMessageTranslated('danger', 'ORGANISATION.SLUG.IN_USE', $data);
             $error = true;
         }