diff --git a/app/config/collections2.php b/app/config/collections2.php
index 077a4a763c..74d4a57ce3 100644
--- a/app/config/collections2.php
+++ b/app/config/collections2.php
@@ -46,7 +46,7 @@ $collections = [
                 '$id' => 'password',
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 32,
+                'size' => 16384,
                 'signed' => true,
                 'required' => false,
                 'array' => false,
@@ -66,12 +66,11 @@ $collections = [
                 '$id' => 'prefs',
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 64000,
+                'size' => 16384,
                 'signed' => true,
                 'required' => false,
                 'array' => false,
                 'filters' => ['json']
-                
             ],
             [
                 '$id' => 'registration',
@@ -107,7 +106,7 @@ $collections = [
                 '$id' => 'sessions',
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 0,
+                'size' => 16384,
                 'signed' => true,
                 'required' => false,
                 'array' => true,
@@ -117,7 +116,7 @@ $collections = [
                 '$id' => 'tokens',
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 0,
+                'size' => 16384,
                 'signed' => true,
                 'required' => false,
                 'array' => true,
@@ -127,12 +126,11 @@ $collections = [
                 '$id' => 'memberships',
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 0,
+                'size' => 16384,
                 'signed' => true,
                 'required' => false,
                 'array' => true,
                 'filters' => ['json'],
-
             ],
         ],
         'indexes' => [
@@ -263,15 +261,22 @@ $collections = [
         ],
         'indexes' => [
             [
-                '$id' => '_key_team',
+                '$id' => '_key_unique',
                 'type' => Database::INDEX_UNIQUE,
+                'attributes' => ['teamId', 'userId'],
+                'lengths' => [Database::LENGTH_KEY, Database::LENGTH_KEY],
+                'orders' => [Database::ORDER_ASC, Database::ORDER_ASC],
+            ],
+            [
+                '$id' => '_key_team',
+                'type' => Database::INDEX_KEY,
                 'attributes' => ['teamId'],
                 'lengths' => [Database::LENGTH_KEY],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => '_key_user',
-                'type' => Database::INDEX_UNIQUE,
+                'type' => Database::INDEX_KEY,
                 'attributes' => ['userId'],
                 'lengths' => [Database::LENGTH_KEY],
                 'orders' => [Database::ORDER_ASC],