diff --git a/composer.lock b/composer.lock
index 8245baac5..1f61b8aef 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2060,16 +2060,16 @@
         },
         {
             "name": "utopia-php/database",
-            "version": "0.25.1",
+            "version": "0.25.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/database.git",
-                "reference": "9d013ce3c111d1477d7986483f1003dcab2b9d14"
+                "reference": "140bbedf1c4d622990fb94d26681fcca235cd5b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/9d013ce3c111d1477d7986483f1003dcab2b9d14",
-                "reference": "9d013ce3c111d1477d7986483f1003dcab2b9d14",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/140bbedf1c4d622990fb94d26681fcca235cd5b9",
+                "reference": "140bbedf1c4d622990fb94d26681fcca235cd5b9",
                 "shasum": ""
             },
             "require": {
@@ -2118,9 +2118,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/0.25.1"
+                "source": "https://github.com/utopia-php/database/tree/0.25.2"
             },
-            "time": "2022-09-07T14:47:52+00:00"
+            "time": "2022-09-09T03:58:01+00:00"
         },
         {
             "name": "utopia-php/domains",
@@ -5384,5 +5384,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/src/Appwrite/Auth/Auth.php b/src/Appwrite/Auth/Auth.php
index 37a2ea8d3..c290d1986 100644
--- a/src/Appwrite/Auth/Auth.php
+++ b/src/Appwrite/Auth/Auth.php
@@ -431,11 +431,14 @@ class Auth
                 continue;
             }
 
-            if (isset($node['teamId']) && isset($node['roles'])) {
+            if (isset($node['$id']) && isset($node['teamId'])) {
                 $roles[] = Role::team($node['teamId'])->toString();
+                $roles[] = Role::member($node['$id'])->toString();
 
-                foreach ($node['roles'] as $nodeRole) { // Set all team roles
-                    $roles[] = Role::team($node['teamId'], $nodeRole)->toString();
+                if (isset($node['roles'])) {
+                    foreach ($node['roles'] as $nodeRole) { // Set all team roles
+                        $roles[] = Role::team($node['teamId'], $nodeRole)->toString();
+                    }
                 }
             }
         }
diff --git a/tests/unit/Auth/AuthTest.php b/tests/unit/Auth/AuthTest.php
index 4cd180b95..1480fbb23 100644
--- a/tests/unit/Auth/AuthTest.php
+++ b/tests/unit/Auth/AuthTest.php
@@ -353,16 +353,58 @@ class AuthTest extends TestCase
             '$id' => ID::custom('123'),
             'memberships' => [
                 [
-                    'confirm' => true,
+                    '$id' => ID::custom('456'),
                     'teamId' => ID::custom('abc'),
+                    'confirm' => true,
                     'roles' => [
                         'administrator',
                         'moderator'
                     ]
                 ],
                 [
-                    'confirm' => true,
+                    '$id' => ID::custom('abc'),
                     'teamId' => ID::custom('def'),
+                    'confirm' => true,
+                    'roles' => [
+                        'guest'
+                    ]
+                ]
+            ]
+        ]);
+
+        $roles = Auth::getRoles($user);
+
+        $this->assertCount(9, $roles);
+        $this->assertContains(Role::users()->toString(), $roles);
+        $this->assertContains(Role::user(ID::custom('123'))->toString(), $roles);
+        $this->assertContains(Role::team(ID::custom('abc'))->toString(), $roles);
+        $this->assertContains(Role::team(ID::custom('abc'), 'administrator')->toString(), $roles);
+        $this->assertContains(Role::team(ID::custom('abc'), 'moderator')->toString(), $roles);
+        $this->assertContains(Role::team(ID::custom('def'))->toString(), $roles);
+        $this->assertContains(Role::team(ID::custom('def'), 'guest')->toString(), $roles);
+        $this->assertContains(Role::member(ID::custom('456'))->toString(), $roles);
+        $this->assertContains(Role::member(ID::custom('abc'))->toString(), $roles);
+    }
+
+    public function testPrivilegedUserRoles(): void
+    {
+        Authorization::setRole(Auth::USER_ROLE_OWNER);
+        $user  = new Document([
+            '$id' => ID::custom('123'),
+            'memberships' => [
+                [
+                    '$id' => ID::custom('def'),
+                    'teamId' => ID::custom('abc'),
+                    'confirm' => true,
+                    'roles' => [
+                        'administrator',
+                        'moderator'
+                    ]
+                ],
+                [
+                    '$id' => ID::custom('abc'),
+                    'teamId' => ID::custom('def'),
+                    'confirm' => true,
                     'roles' => [
                         'guest'
                     ]
@@ -373,42 +415,6 @@ class AuthTest extends TestCase
         $roles = Auth::getRoles($user);
 
         $this->assertCount(7, $roles);
-        $this->assertContains(Role::users()->toString(), $roles);
-        $this->assertContains(Role::user(ID::custom('123'))->toString(), $roles);
-        $this->assertContains(Role::team(ID::custom('abc'))->toString(), $roles);
-        $this->assertContains(Role::team(ID::custom('abc'), 'administrator')->toString(), $roles);
-        $this->assertContains(Role::team(ID::custom('abc'), 'moderator')->toString(), $roles);
-        $this->assertContains(Role::team(ID::custom('def'))->toString(), $roles);
-        $this->assertContains(Role::team(ID::custom('def'), 'guest')->toString(), $roles);
-    }
-
-    public function testPrivilegedUserRoles(): void
-    {
-        Authorization::setRole(Auth::USER_ROLE_OWNER);
-        $user  = new Document([
-            '$id' => ID::custom('123'),
-            'memberships' => [
-                [
-                    'confirm' => true,
-                    'teamId' => ID::custom('abc'),
-                    'roles' => [
-                        'administrator',
-                        'moderator'
-                    ]
-                ],
-                [
-                    'confirm' => true,
-                    'teamId' => ID::custom('def'),
-                    'roles' => [
-                        'guest'
-                    ]
-                ]
-            ]
-        ]);
-
-        $roles = Auth::getRoles($user);
-
-        $this->assertCount(5, $roles);
         $this->assertNotContains(Role::users()->toString(), $roles);
         $this->assertNotContains(Role::user(ID::custom('123'))->toString(), $roles);
         $this->assertContains(Role::team(ID::custom('abc'))->toString(), $roles);
@@ -416,6 +422,8 @@ class AuthTest extends TestCase
         $this->assertContains(Role::team(ID::custom('abc'), 'moderator')->toString(), $roles);
         $this->assertContains(Role::team(ID::custom('def'))->toString(), $roles);
         $this->assertContains(Role::team(ID::custom('def'), 'guest')->toString(), $roles);
+        $this->assertContains(Role::member(ID::custom('def'))->toString(), $roles);
+        $this->assertContains(Role::member(ID::custom('abc'))->toString(), $roles);
     }
 
     public function testAppUserRoles(): void
@@ -425,16 +433,18 @@ class AuthTest extends TestCase
             '$id' => ID::custom('123'),
             'memberships' => [
                 [
-                    'confirm' => true,
+                    '$id' => ID::custom('def'),
                     'teamId' => ID::custom('abc'),
+                    'confirm' => true,
                     'roles' => [
                         'administrator',
                         'moderator'
                     ]
                 ],
                 [
-                    'confirm' => true,
+                    '$id' => ID::custom('abc'),
                     'teamId' => ID::custom('def'),
+                    'confirm' => true,
                     'roles' => [
                         'guest'
                     ]
@@ -444,7 +454,7 @@ class AuthTest extends TestCase
 
         $roles = Auth::getRoles($user);
 
-        $this->assertCount(5, $roles);
+        $this->assertCount(7, $roles);
         $this->assertNotContains(Role::users()->toString(), $roles);
         $this->assertNotContains(Role::user(ID::custom('123'))->toString(), $roles);
         $this->assertContains(Role::team(ID::custom('abc'))->toString(), $roles);
@@ -452,5 +462,7 @@ class AuthTest extends TestCase
         $this->assertContains(Role::team(ID::custom('abc'), 'moderator')->toString(), $roles);
         $this->assertContains(Role::team(ID::custom('def'))->toString(), $roles);
         $this->assertContains(Role::team(ID::custom('def'), 'guest')->toString(), $roles);
+        $this->assertContains(Role::member(ID::custom('def'))->toString(), $roles);
+        $this->assertContains(Role::member(ID::custom('abc'))->toString(), $roles);
     }
 }
diff --git a/tests/unit/Messaging/MessagingChannelsTest.php b/tests/unit/Messaging/MessagingChannelsTest.php
index 26a110668..dd2ec0440 100644
--- a/tests/unit/Messaging/MessagingChannelsTest.php
+++ b/tests/unit/Messaging/MessagingChannelsTest.php
@@ -54,8 +54,9 @@ class MessagingChannelsTest extends TestCase
                     '$id' => ID::custom('user' . $this->connectionsCount),
                     'memberships' => [
                         [
-                            'confirm' => true,
+                            '$id' => ID::custom('member' . $i),
                             'teamId' => ID::custom('team' . $i),
+                            'confirm' => true,
                             'roles' => [
                                 empty($index % 2)
                                     ? Auth::USER_ROLE_ADMIN
@@ -122,11 +123,11 @@ class MessagingChannelsTest extends TestCase
          * Check for correct amount of subscriptions:
          *  - XXX users
          *  - XXX teams
-         *  - XXX team roles (2 roles per team)
+         *  - XXX team roles (3 roles per team)
          *  - 1 guests
          *  - 1 users
          */
-        $this->assertCount(($this->connectionsAuthenticated + (3 * $this->connectionsPerChannel) + 2), $this->realtime->subscriptions['1']);
+        $this->assertCount(($this->connectionsAuthenticated + (4 * $this->connectionsPerChannel) + 2), $this->realtime->subscriptions['1']);
 
         /**
          * Check for connections
@@ -138,7 +139,7 @@ class MessagingChannelsTest extends TestCase
         $this->realtime->unsubscribe(-1);
 
         $this->assertCount($this->connectionsTotal, $this->realtime->connections);
-        $this->assertCount(($this->connectionsAuthenticated + (3 * $this->connectionsPerChannel) + 2), $this->realtime->subscriptions['1']);
+        $this->assertCount(($this->connectionsAuthenticated + (4 * $this->connectionsPerChannel) + 2), $this->realtime->subscriptions['1']);
 
         for ($i = 0; $i < $this->connectionsCount; $i++) {
             $this->realtime->unsubscribe($i);
@@ -259,6 +260,7 @@ class MessagingChannelsTest extends TestCase
 
             for ($i = 0; $i < $this->connectionsPerChannel; $i++) {
                 $permissions[] = Role::team(ID::custom('team' . $i))->toString();
+                $permissions[] = Role::member(ID::custom('member' . $i))->toString();
             }
             $event = [
                 'project' => '1',
@@ -284,13 +286,13 @@ class MessagingChannelsTest extends TestCase
                 $this->assertStringEndsWith($index, $receiver);
             }
 
+            $role = empty($index % 2)
+                ? Auth::USER_ROLE_ADMIN
+                : 'member';
+
             $permissions = [
-                Role::team(
-                    ID::custom('team' . $index),
-                    (empty($index % 2)
-                        ? Auth::USER_ROLE_ADMIN
-                        : 'member')
-                )->toString()
+                Role::team(ID::custom('team' . $index), $role)->toString(),
+                Role::member(ID::custom('member' . $index))->toString()
             ];
 
             $event = [