diff --git a/surfsense_backend/app/routes/confluence_add_connector_route.py b/surfsense_backend/app/routes/confluence_add_connector_route.py
index a583c905a..7c2a0e2ca 100644
--- a/surfsense_backend/app/routes/confluence_add_connector_route.py
+++ b/surfsense_backend/app/routes/confluence_add_connector_route.py
@@ -26,7 +26,10 @@ from app.db import (
 from app.schemas.atlassian_auth_credentials import AtlassianAuthCredentialsBase
 from app.users import current_active_user
 from app.utils.oauth_security import OAuthStateManager, TokenEncryption
-from app.utils.connector_naming import generate_unique_connector_name, extract_identifier_from_credentials
+from app.utils.connector_naming import (
+    extract_identifier_from_credentials,
+    generate_unique_connector_name,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -293,9 +296,13 @@ async def confluence_callback(
         connector_identifier = extract_identifier_from_credentials(
             SearchSourceConnectorType.CONFLUENCE_CONNECTOR, connector_config
         )
-        # Generate a unique, user-friendly connector name from credentials/account info
-        connector_name = generate_unique_connector_name(
-            SearchSourceConnectorType.CONFLUENCE_CONNECTOR, connector_identifier
+        # Generate a unique, user-friendly connector name
+        connector_name = await generate_unique_connector_name(
+            session,
+            SearchSourceConnectorType.CONFLUENCE_CONNECTOR,
+            space_id,
+            user_id,
+            connector_identifier,
         )
         # Create new connector
         new_connector = SearchSourceConnector(
diff --git a/surfsense_backend/app/routes/discord_add_connector_route.py b/surfsense_backend/app/routes/discord_add_connector_route.py
index 73092f143..d32902730 100644
--- a/surfsense_backend/app/routes/discord_add_connector_route.py
+++ b/surfsense_backend/app/routes/discord_add_connector_route.py
@@ -26,7 +26,10 @@ from app.db import (
 from app.schemas.discord_auth_credentials import DiscordAuthCredentialsBase
 from app.users import current_active_user
 from app.utils.oauth_security import OAuthStateManager, TokenEncryption
-from app.utils.connector_naming import generate_unique_connector_name, extract_identifier_from_credentials
+from app.utils.connector_naming import (
+    extract_identifier_from_credentials,
+    generate_unique_connector_name,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -289,9 +292,13 @@ async def discord_callback(
         connector_identifier = extract_identifier_from_credentials(
             SearchSourceConnectorType.DISCORD_CONNECTOR, connector_config
         )
-        # Generate a unique, user-friendly connector name from credentials/account info
-        connector_name = generate_unique_connector_name(
-            SearchSourceConnectorType.DISCORD_CONNECTOR, connector_identifier
+        # Generate a unique, user-friendly connector name
+        connector_name = await generate_unique_connector_name(
+            session,
+            SearchSourceConnectorType.DISCORD_CONNECTOR,
+            space_id,
+            user_id,
+            connector_identifier,
         )
         # Create new connector
         new_connector = SearchSourceConnector(
diff --git a/surfsense_backend/app/routes/jira_add_connector_route.py b/surfsense_backend/app/routes/jira_add_connector_route.py
index 0d662f095..4cb595058 100644
--- a/surfsense_backend/app/routes/jira_add_connector_route.py
+++ b/surfsense_backend/app/routes/jira_add_connector_route.py
@@ -27,7 +27,10 @@ from app.db import (
 from app.schemas.atlassian_auth_credentials import AtlassianAuthCredentialsBase
 from app.users import current_active_user
 from app.utils.oauth_security import OAuthStateManager, TokenEncryption
-from app.utils.connector_naming import generate_unique_connector_name, extract_identifier_from_credentials
+from app.utils.connector_naming import (
+    extract_identifier_from_credentials,
+    generate_unique_connector_name,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -311,9 +314,13 @@ async def jira_callback(
         connector_identifier = extract_identifier_from_credentials(
             SearchSourceConnectorType.JIRA_CONNECTOR, connector_config
         )
-        # Generate a unique, user-friendly connector name from credentials/account info
-        connector_name = generate_unique_connector_name(
-            SearchSourceConnectorType.JIRA_CONNECTOR, connector_identifier
+        # Generate a unique, user-friendly connector name
+        connector_name = await generate_unique_connector_name(
+            session,
+            SearchSourceConnectorType.JIRA_CONNECTOR,
+            space_id,
+            user_id,
+            connector_identifier,
         )
         # Create new connector
         new_connector = SearchSourceConnector(
diff --git a/surfsense_backend/app/routes/notion_add_connector_route.py b/surfsense_backend/app/routes/notion_add_connector_route.py
index 832ca4abc..251814d58 100644
--- a/surfsense_backend/app/routes/notion_add_connector_route.py
+++ b/surfsense_backend/app/routes/notion_add_connector_route.py
@@ -26,7 +26,10 @@ from app.db import (
 from app.schemas.notion_auth_credentials import NotionAuthCredentialsBase
 from app.users import current_active_user
 from app.utils.oauth_security import OAuthStateManager, TokenEncryption
-from app.utils.connector_naming import generate_unique_connector_name, extract_identifier_from_credentials
+from app.utils.connector_naming import (
+    extract_identifier_from_credentials,
+    generate_unique_connector_name,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -267,9 +270,13 @@ async def notion_callback(
         connector_identifier = extract_identifier_from_credentials(
             SearchSourceConnectorType.NOTION_CONNECTOR, connector_config
         )
-        # Generate a unique, user-friendly connector name from credentials/account info
-        connector_name = generate_unique_connector_name(
-            SearchSourceConnectorType.NOTION_CONNECTOR, connector_identifier
+        # Generate a unique, user-friendly connector name
+        connector_name = await generate_unique_connector_name(
+            session,
+            SearchSourceConnectorType.NOTION_CONNECTOR,
+            space_id,
+            user_id,
+            connector_identifier,
         )
         # Create new connector
         new_connector = SearchSourceConnector(
diff --git a/surfsense_backend/app/routes/slack_add_connector_route.py b/surfsense_backend/app/routes/slack_add_connector_route.py
index c0693f16f..50c505a78 100644
--- a/surfsense_backend/app/routes/slack_add_connector_route.py
+++ b/surfsense_backend/app/routes/slack_add_connector_route.py
@@ -25,8 +25,11 @@ from app.db import (
 )
 from app.schemas.slack_auth_credentials import SlackAuthCredentialsBase
 from app.users import current_active_user
+from app.utils.connector_naming import (
+    extract_identifier_from_credentials,
+    generate_unique_connector_name,
+)
 from app.utils.oauth_security import OAuthStateManager, TokenEncryption
-from app.utils.connector_naming import generate_unique_connector_name, extract_identifier_from_credentials
 
 logger = logging.getLogger(__name__)
 
@@ -277,9 +280,13 @@ async def slack_callback(
         connector_identifier = extract_identifier_from_credentials(
             SearchSourceConnectorType.SLACK_CONNECTOR, connector_config
         )
-        # Generate a unique, user-friendly connector name from credentials/account info
-        connector_name = generate_unique_connector_name(
-            SearchSourceConnectorType.SLACK_CONNECTOR, connector_identifier
+        # Generate a unique, user-friendly connector name
+        connector_name = await generate_unique_connector_name(
+            session,
+            SearchSourceConnectorType.SLACK_CONNECTOR,
+            space_id,
+            user_id,
+            connector_identifier,
         )
 
         # Create new connector