diff --git a/resources/lib/UnityOrg.php b/resources/lib/UnityOrg.php
index 991f1ddb..c965d628 100644
--- a/resources/lib/UnityOrg.php
+++ b/resources/lib/UnityOrg.php
@@ -55,11 +55,9 @@ public function getOrgID()
         return $this->orgid;
     }
 
-    public function inOrg($user)
+    public function inOrg($user, $ignorecache = false)
     {
-        $org_group = $this->getLDAPOrgGroup();
-        $members = $org_group->getAttribute("memberuid");
-        return in_array($user, $members);
+        return in_array($user->getUID(), $this->getOrgMemberUIDs($ignorecache));
     }
 
     public function getOrgMembers($ignorecache = false)
diff --git a/resources/lib/UnityUser.php b/resources/lib/UnityUser.php
index 04c412b9..73926575 100644
--- a/resources/lib/UnityUser.php
+++ b/resources/lib/UnityUser.php
@@ -107,7 +107,7 @@ public function init($send_mail = true)
             $orgEntry->init();
         }
 
-        if (!$orgEntry->inOrg($this->uid)) {
+        if (!$orgEntry->inOrg($this)) {
             $orgEntry->addUser($this);
         }