diff --git a/openpype/modules/ftrack/ftrack_module.py b/openpype/modules/ftrack/ftrack_module.py
index e1af9c15a7..cd383cbdc6 100644
--- a/openpype/modules/ftrack/ftrack_module.py
+++ b/openpype/modules/ftrack/ftrack_module.py
@@ -210,3 +210,7 @@ class FtrackModule(
 
     def tray_exit(self):
         return self.tray_module.stop_action_server()
+
+    def set_credentials_to_env(self, username, api_key):
+        os.environ["FTRACK_API_USER"] = username or ""
+        os.environ["FTRACK_API_KEY"] = api_key or ""
diff --git a/openpype/modules/ftrack/lib/credentials.py b/openpype/modules/ftrack/lib/credentials.py
index 6ca9b730da..3d9aa75e84 100644
--- a/openpype/modules/ftrack/lib/credentials.py
+++ b/openpype/modules/ftrack/lib/credentials.py
@@ -108,11 +108,6 @@ def clear_credentials(ft_user=None, ftrack_server=None, user=None):
         file.write(json.dumps(content_json))
 
 
-def set_env(ft_user=None, ft_api_key=None):
-    os.environ["FTRACK_API_USER"] = ft_user or ""
-    os.environ["FTRACK_API_KEY"] = ft_api_key or ""
-
-
 def check_credentials(ft_user, ft_api_key, ftrack_server=None):
     if not ftrack_server:
         ftrack_server = os.environ["FTRACK_SERVER"]
diff --git a/openpype/modules/ftrack/tray/ftrack_tray.py b/openpype/modules/ftrack/tray/ftrack_tray.py
index 9da5db835b..ee27d8b730 100644
--- a/openpype/modules/ftrack/tray/ftrack_tray.py
+++ b/openpype/modules/ftrack/tray/ftrack_tray.py
@@ -30,7 +30,7 @@ class FtrackTrayWrapper:
         self.bool_action_thread_running = False
         self.bool_timer_event = False
 
-        self.widget_login = login_dialog.CredentialsDialog()
+        self.widget_login = login_dialog.CredentialsDialog(module)
         self.widget_login.login_changed.connect(self.on_login_change)
         self.widget_login.logout_signal.connect(self.on_logout)
 
@@ -56,7 +56,7 @@ class FtrackTrayWrapper:
         validation = credentials.check_credentials(ft_user, ft_api_key)
         if validation:
             self.widget_login.set_credentials(ft_user, ft_api_key)
-            credentials.set_env(ft_user, ft_api_key)
+            self.module.set_credentials_to_env(ft_user, ft_api_key)
             log.info("Connected to Ftrack successfully")
             self.on_login_change()
 
@@ -337,7 +337,7 @@ class FtrackTrayWrapper:
 
     def changed_user(self):
         self.stop_action_server()
-        credentials.set_env()
+        self.module.set_credentials_to_env(None, None)
         self.validate()
 
     def start_timer_manager(self, data):
diff --git a/openpype/modules/ftrack/tray/login_dialog.py b/openpype/modules/ftrack/tray/login_dialog.py
index ca409ebcaa..ce91c6d012 100644
--- a/openpype/modules/ftrack/tray/login_dialog.py
+++ b/openpype/modules/ftrack/tray/login_dialog.py
@@ -14,11 +14,13 @@ class CredentialsDialog(QtWidgets.QDialog):
     login_changed = QtCore.Signal()
     logout_signal = QtCore.Signal()
 
-    def __init__(self, parent=None):
+    def __init__(self, module, parent=None):
         super(CredentialsDialog, self).__init__(parent)
 
         self.setWindowTitle("OpenPype - Ftrack Login")
 
+        self._module = module
+
         self._login_server_thread = None
         self._is_logged = False
         self._in_advance_mode = False
@@ -268,7 +270,7 @@ class CredentialsDialog(QtWidgets.QDialog):
         verification = credentials.check_credentials(username, api_key)
         if verification:
             credentials.save_credentials(username, api_key, False)
-            credentials.set_env(username, api_key)
+            self._module.set_credentials_to_env(username, api_key)
             self.set_credentials(username, api_key)
             self.login_changed.emit()
         return verification