diff --git a/app/project_management/models/project_milestone.py b/app/project_management/models/project_milestone.py
index 86ad1966..c804ef80 100644
--- a/app/project_management/models/project_milestone.py
+++ b/app/project_management/models/project_milestone.py
@@ -1,4 +1,3 @@
-from django.contrib.auth.models import User
 from django.db import models
 
 from access.fields import AutoCreatedField
diff --git a/app/project_management/models/projects.py b/app/project_management/models/projects.py
index 436e12fa..29ac27c2 100644
--- a/app/project_management/models/projects.py
+++ b/app/project_management/models/projects.py
@@ -1,4 +1,4 @@
-from django.contrib.auth.models import User
+from django.conf import settings
 from django.db import models
 
 from access.models.team import Team
@@ -152,7 +152,7 @@ class Project(ProjectCommonFieldsName):
     )
 
     manager_user = models.ForeignKey(
-        User,
+        settings.AUTH_USER_MODEL,
         blank= True,
         help_text = 'User who is the Project Manager',
         on_delete=models.SET_NULL,
@@ -173,7 +173,7 @@ class Project(ProjectCommonFieldsName):
     model_notes = None
 
     team_members = models.ManyToManyField(
-        to = User,
+        to = settings.AUTH_USER_MODEL,
         blank = True,
     )
 
diff --git a/app/project_management/tests/functional/project/test_project_viewset.py b/app/project_management/tests/functional/project/test_project_viewset.py
index 4dcf23d9..852b0538 100644
--- a/app/project_management/tests/functional/project/test_project_viewset.py
+++ b/app/project_management/tests/functional/project/test_project_viewset.py
@@ -1,6 +1,7 @@
+import django
 import pytest
 
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -17,6 +18,8 @@ from project_management.models.projects import Project
 
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:
diff --git a/app/project_management/tests/functional/project_milestone/test_project_milestone_viewset.py b/app/project_management/tests/functional/project_milestone/test_project_milestone_viewset.py
index f648eec9..29bf50d2 100644
--- a/app/project_management/tests/functional/project_milestone/test_project_milestone_viewset.py
+++ b/app/project_management/tests/functional/project_milestone/test_project_milestone_viewset.py
@@ -1,6 +1,7 @@
+import django
 import pytest
 
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
@@ -14,6 +15,8 @@ from api.tests.abstract.test_metadata_functional import MetadataAttributesFuncti
 
 from project_management.models.project_milestone import Project, ProjectMilestone
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:
diff --git a/app/project_management/tests/functional/project_state/test_project_state_viewset.py b/app/project_management/tests/functional/project_state/test_project_state_viewset.py
index 4c6e22d3..c63350b2 100644
--- a/app/project_management/tests/functional/project_state/test_project_state_viewset.py
+++ b/app/project_management/tests/functional/project_state/test_project_state_viewset.py
@@ -1,6 +1,7 @@
+import django
 import pytest
 
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
@@ -16,6 +17,8 @@ from project_management.models.project_states import ProjectState
 
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:
diff --git a/app/project_management/tests/functional/project_type/test_project_type_viewset.py b/app/project_management/tests/functional/project_type/test_project_type_viewset.py
index 2d2183a3..431734ab 100644
--- a/app/project_management/tests/functional/project_type/test_project_type_viewset.py
+++ b/app/project_management/tests/functional/project_type/test_project_type_viewset.py
@@ -1,6 +1,7 @@
+import django
 import pytest
 
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
@@ -16,6 +17,8 @@ from project_management.models.project_types import ProjectType
 
 from settings.models.app_settings import AppSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ViewSetBase:
diff --git a/app/project_management/tests/unit/project/test_project_api_v2.py b/app/project_management/tests/unit/project/test_project_api_v2.py
index d43837e2..9543410f 100644
--- a/app/project_management/tests/unit/project/test_project_api_v2.py
+++ b/app/project_management/tests/unit/project/test_project_api_v2.py
@@ -1,7 +1,8 @@
+import django
 import pytest
 import unittest
 
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -22,6 +23,8 @@ from project_management.models.projects import Project, ProjectState, ProjectTyp
 
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ProjectAPI(
diff --git a/app/project_management/tests/unit/project/test_project_permission.py b/app/project_management/tests/unit/project/test_project_permission.py
index 278e77a2..2706c59d 100644
--- a/app/project_management/tests/unit/project/test_project_permission.py
+++ b/app/project_management/tests/unit/project/test_project_permission.py
@@ -1,6 +1,6 @@
-# from django.conf import settings
+import django
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
@@ -17,6 +17,9 @@ from app.tests.abstract.model_permissions import ModelPermissions
 
 from project_management.models.projects import Project
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class ProjectPermissions(TestCase, ModelPermissions):
 
diff --git a/app/project_management/tests/unit/project/test_project_permission_api.py b/app/project_management/tests/unit/project/test_project_permission_api.py
index d8f09306..4093e9ce 100644
--- a/app/project_management/tests/unit/project/test_project_permission_api.py
+++ b/app/project_management/tests/unit/project/test_project_permission_api.py
@@ -1,8 +1,9 @@
+import django
 import pytest
 import unittest
 import requests
 
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
@@ -14,6 +15,9 @@ from api.tests.abstract.api_permissions import APIPermissions
 
 from core.models.ticket.ticket_comment_category import TicketCommentCategory
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class TicketCommentCategoryPermissionsAPI(TestCase, APIPermissions):
 
diff --git a/app/project_management/tests/unit/project_milestone/test_project_milestone_api_v2.py b/app/project_management/tests/unit/project_milestone/test_project_milestone_api_v2.py
index 2939ada1..4da82091 100644
--- a/app/project_management/tests/unit/project_milestone/test_project_milestone_api_v2.py
+++ b/app/project_management/tests/unit/project_milestone/test_project_milestone_api_v2.py
@@ -1,7 +1,8 @@
+import django
 import pytest
 import unittest
 
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -18,6 +19,8 @@ from project_management.models.project_milestone import Project, ProjectMileston
 
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ProjectMilestoneAPI(
diff --git a/app/project_management/tests/unit/project_milestone/test_project_milestone_permission.py b/app/project_management/tests/unit/project_milestone/test_project_milestone_permission.py
index 0725ef67..58f155a4 100644
--- a/app/project_management/tests/unit/project_milestone/test_project_milestone_permission.py
+++ b/app/project_management/tests/unit/project_milestone/test_project_milestone_permission.py
@@ -1,6 +1,7 @@
-# from django.conf import settings
+import django
+
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
@@ -17,6 +18,9 @@ from app.tests.abstract.model_permissions import ModelPermissions
 
 from project_management.models.project_milestone import Project, ProjectMilestone
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class ProjectMilestonePermissions(TestCase, ModelPermissions):
 
diff --git a/app/project_management/tests/unit/project_milestone/test_project_milestone_permission_api.py b/app/project_management/tests/unit/project_milestone/test_project_milestone_permission_api.py
index 47a3c37c..8170cff0 100644
--- a/app/project_management/tests/unit/project_milestone/test_project_milestone_permission_api.py
+++ b/app/project_management/tests/unit/project_milestone/test_project_milestone_permission_api.py
@@ -1,8 +1,9 @@
+import django
 import pytest
 import unittest
 import requests
 
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -16,6 +17,9 @@ from api.tests.abstract.api_permissions import APIPermissions
 from project_management.models.projects import Project
 from project_management.models.project_milestone import Project, ProjectMilestone
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class ProjectMilestonePermissionsAPI(TestCase, APIPermissions):
 
diff --git a/app/project_management/tests/unit/project_state/test_project_state_api_v2.py b/app/project_management/tests/unit/project_state/test_project_state_api_v2.py
index a39e4c9e..25845206 100644
--- a/app/project_management/tests/unit/project_state/test_project_state_api_v2.py
+++ b/app/project_management/tests/unit/project_state/test_project_state_api_v2.py
@@ -1,7 +1,8 @@
+import django
 import pytest
 import unittest
 
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -20,6 +21,8 @@ from project_management.models.projects import ProjectState
 
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ProjectStateAPI(
diff --git a/app/project_management/tests/unit/project_state/test_project_state_permission.py b/app/project_management/tests/unit/project_state/test_project_state_permission.py
index 0df46b85..9aa2145e 100644
--- a/app/project_management/tests/unit/project_state/test_project_state_permission.py
+++ b/app/project_management/tests/unit/project_state/test_project_state_permission.py
@@ -1,6 +1,7 @@
-# from django.conf import settings
+import django
+
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
@@ -17,6 +18,8 @@ from app.tests.abstract.model_permissions import ModelPermissions
 
 from project_management.models.project_states import ProjectState
 
+User = django.contrib.auth.get_user_model()
+
 
 class ProjectStatePermissions(TestCase, ModelPermissions):
 
diff --git a/app/project_management/tests/unit/project_state/test_project_state_permission_api.py b/app/project_management/tests/unit/project_state/test_project_state_permission_api.py
index 2186edec..dd1716b4 100644
--- a/app/project_management/tests/unit/project_state/test_project_state_permission_api.py
+++ b/app/project_management/tests/unit/project_state/test_project_state_permission_api.py
@@ -1,8 +1,9 @@
+import django
 import pytest
 import unittest
 import requests
 
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
@@ -14,6 +15,8 @@ from api.tests.abstract.api_permissions import APIPermissions
 
 from project_management.models.project_states import ProjectState
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ProjectStatePermissionsAPI(TestCase, APIPermissions):
diff --git a/app/project_management/tests/unit/project_type/test_project_type_api_v2.py b/app/project_management/tests/unit/project_type/test_project_type_api_v2.py
index f7ae406f..9f4617ef 100644
--- a/app/project_management/tests/unit/project_type/test_project_type_api_v2.py
+++ b/app/project_management/tests/unit/project_type/test_project_type_api_v2.py
@@ -1,7 +1,8 @@
+import django
 import pytest
 import unittest
 
-from django.contrib.auth.models import Permission, User
+from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import Client, TestCase
@@ -20,6 +21,8 @@ from project_management.models.project_types import ProjectType
 
 from settings.models.user_settings import UserSettings
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ProjectTypeAPI(
diff --git a/app/project_management/tests/unit/project_type/test_project_type_permission.py b/app/project_management/tests/unit/project_type/test_project_type_permission.py
index f02737f4..75ec40de 100644
--- a/app/project_management/tests/unit/project_type/test_project_type_permission.py
+++ b/app/project_management/tests/unit/project_type/test_project_type_permission.py
@@ -1,6 +1,7 @@
-# from django.conf import settings
+import django
+
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import reverse
 from django.test import TestCase, Client
@@ -17,6 +18,9 @@ from app.tests.abstract.model_permissions import ModelPermissions
 
 from project_management.models.project_types import ProjectType
 
+User = django.contrib.auth.get_user_model()
+
+
 
 class ProjectTypePermissions(TestCase, ModelPermissions):
 
diff --git a/app/project_management/tests/unit/project_type/test_project_type_permission_api.py b/app/project_management/tests/unit/project_type/test_project_type_permission_api.py
index 50e2af2e..f689bffe 100644
--- a/app/project_management/tests/unit/project_type/test_project_type_permission_api.py
+++ b/app/project_management/tests/unit/project_type/test_project_type_permission_api.py
@@ -1,8 +1,9 @@
+import django
 import pytest
 import unittest
 import requests
 
-from django.contrib.auth.models import AnonymousUser, Permission, User
+from django.contrib.auth.models import AnonymousUser, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
 
@@ -14,6 +15,8 @@ from api.tests.abstract.api_permissions import APIPermissions
 
 from project_management.models.project_types import ProjectType
 
+User = django.contrib.auth.get_user_model()
+
 
 
 class ProjectTypePermissionsAPI(TestCase, APIPermissions):