diff --git a/apps/assets/models/asset.py b/apps/assets/models/asset.py
index cfe73842f..c44239f55 100644
--- a/apps/assets/models/asset.py
+++ b/apps/assets/models/asset.py
@@ -225,7 +225,7 @@ class Asset(OrgModelMixin):
         return data
 
     class Meta:
-        unique_together = [('org', 'hostname'),]
+        unique_together = [('org_id', 'hostname')]
         verbose_name = _("Asset")
 
     @classmethod
diff --git a/apps/assets/models/domain.py b/apps/assets/models/domain.py
index 376c032d7..c0a4ee638 100644
--- a/apps/assets/models/domain.py
+++ b/apps/assets/models/domain.py
@@ -34,7 +34,7 @@ class Domain(OrgModelMixin):
         return random.choice(self.gateways)
 
 
-class Gateway(AssetUser, OrgModelMixin):
+class Gateway(AssetUser):
     SSH_PROTOCOL = 'ssh'
     RDP_PROTOCOL = 'rdp'
     PROTOCOL_CHOICES = (
@@ -52,4 +52,4 @@ class Gateway(AssetUser, OrgModelMixin):
         return self.name
 
     class Meta:
-        unique_together = [('name', 'org')]
+        unique_together = [('name', 'org_id')]
diff --git a/apps/assets/models/label.py b/apps/assets/models/label.py
index 6a2cefde9..41f0f8724 100644
--- a/apps/assets/models/label.py
+++ b/apps/assets/models/label.py
@@ -34,4 +34,4 @@ class Label(models.Model):
 
     class Meta:
         db_table = "assets_label"
-        unique_together = [('name', 'value'),]
+        unique_together = [('name', 'value')]
diff --git a/apps/assets/models/user.py b/apps/assets/models/user.py
index 8fb415a85..be7a98ebf 100644
--- a/apps/assets/models/user.py
+++ b/apps/assets/models/user.py
@@ -69,7 +69,7 @@ class AdminUser(AssetUser):
 
     class Meta:
         ordering = ['name']
-        unique_together = [('name', 'org'),]
+        unique_together = [('name', 'org_id')]
         verbose_name = _("Admin user")
 
     @classmethod
@@ -157,7 +157,7 @@ class SystemUser(AssetUser):
 
     class Meta:
         ordering = ['name']
-        unique_together = [('name', 'org'),]
+        unique_together = [('name', 'org_id')]
         verbose_name = _("System user")
 
     @classmethod
diff --git a/apps/orgs/mixins.py b/apps/orgs/mixins.py
index 4d8097d99..194e1ef37 100644
--- a/apps/orgs/mixins.py
+++ b/apps/orgs/mixins.py
@@ -27,9 +27,9 @@ class OrgManager(models.Manager):
         if not current_org:
             kwargs['id'] = None
         elif current_org.is_real():
-            kwargs['org'] = current_org
+            kwargs['org_id'] = current_org.id
         elif current_org.is_default():
-            kwargs['org'] = None
+            kwargs['org_id'] = None
         queryset = super(OrgManager, self).get_queryset()
         queryset = queryset.filter(**kwargs)
         # print(kwargs)
@@ -53,13 +53,13 @@ class OrgManager(models.Manager):
 
 
 class OrgModelMixin(models.Model):
-    org = models.ForeignKey('orgs.Organization', on_delete=models.PROTECT, null=True)
+    org_id = models.CharField(max_length=36, null=True)
     objects = OrgManager()
 
     def save(self, *args, **kwargs):
         current_org = get_current_org()
         if current_org and current_org.is_real():
-            self.org = current_org
+            self.org_id = current_org.id
         return super(OrgModelMixin, self).save(*args, **kwargs)
 
     class Meta:
diff --git a/apps/users/models/group.py b/apps/users/models/group.py
index 1a8ccac2b..e3d310d97 100644
--- a/apps/users/models/group.py
+++ b/apps/users/models/group.py
@@ -22,7 +22,7 @@ class UserGroup(OrgModelMixin):
 
     class Meta:
         ordering = ['name']
-        unique_together = [('org', 'name'),]
+        unique_together = [('org_id', 'name')]
         verbose_name = _("User group")
 
     @classmethod