diff --git a/src/Simplex/Chat/Library/Commands.hs b/src/Simplex/Chat/Library/Commands.hs
index 8c475b111b..d3b945af4f 100644
--- a/src/Simplex/Chat/Library/Commands.hs
+++ b/src/Simplex/Chat/Library/Commands.hs
@@ -1671,10 +1671,25 @@ processChatCommand' vr = \case
     case (pccConnStatus, connLinkInv) of
       (ConnNew, Just (CCLink cReqInv _)) -> do
         newUser <- privateGetUser newUserId
-        conn' <- recreateConn user conn newUser
+        conn' <- ifM (canKeepLink cReqInv newUser) (updateConnRecord user conn newUser) (recreateConn user conn newUser)
         pure $ CRConnectionUserChanged user conn conn' newUser
       _ -> throwChatError CEConnectionUserChangeProhibited
     where
+      canKeepLink :: ConnReqInvitation -> User -> CM Bool
+      canKeepLink (CRInvitationUri crData _) newUser = do
+        let ConnReqUriData {crSmpQueues = q :| _} = crData
+            SMPQueueUri {queueAddress = SMPQueueAddress {smpServer}} = q
+        newUserServers <-
+          map protoServer' . L.filter (\ServerCfg {enabled} -> enabled)
+            <$> getKnownAgentServers SPSMP newUser
+        pure $ smpServer `elem` newUserServers
+      updateConnRecord user@User {userId} conn@PendingContactConnection {customUserProfileId} newUser = do
+        withAgent $ \a -> changeConnectionUser a (aUserId user) (aConnId' conn) (aUserId newUser)
+        withFastStore' $ \db -> do
+          conn' <- updatePCCUser db userId conn newUserId
+          forM_ customUserProfileId $ \profileId ->
+            deletePCCIncognitoProfile db user profileId
+          pure conn'
       recreateConn user conn@PendingContactConnection {customUserProfileId, connLinkInv} newUser = do
         subMode <- chatReadVar subscriptionMode
         let userData = shortLinkUserData $ isJust $ connShortLink =<< connLinkInv
diff --git a/src/Simplex/Chat/Store/Direct.hs b/src/Simplex/Chat/Store/Direct.hs
index 9318f62f76..4de832a8b1 100644
--- a/src/Simplex/Chat/Store/Direct.hs
+++ b/src/Simplex/Chat/Store/Direct.hs
@@ -66,6 +66,7 @@ module Simplex.Chat.Store.Direct
     updateContactAccepted,
     getUserByContactRequestId,
     getPendingContactConnections,
+    updatePCCUser,
     getContactConnections,
     getConnectionById,
     getConnectionsContacts,
@@ -439,6 +440,19 @@ updatePCCIncognito db User {userId} conn customUserProfileId = do
     (customUserProfileId, updatedAt, userId, pccConnId conn)
   pure (conn :: PendingContactConnection) {customUserProfileId, updatedAt}
 
+updatePCCUser :: DB.Connection -> UserId -> PendingContactConnection -> UserId -> IO PendingContactConnection
+updatePCCUser db userId conn newUserId = do
+  updatedAt <- getCurrentTime
+  DB.execute
+    db
+    [sql|
+      UPDATE connections
+      SET user_id = ?, custom_user_profile_id = NULL, updated_at = ?
+      WHERE user_id = ? AND connection_id = ?
+    |]
+    (newUserId, updatedAt, userId, pccConnId conn)
+  pure (conn :: PendingContactConnection) {customUserProfileId = Nothing, updatedAt}
+
 deletePCCIncognitoProfile :: DB.Connection -> User -> ProfileId -> IO ()
 deletePCCIncognitoProfile db User {userId} profileId =
   DB.execute
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt
index a85ba4a4cb..13215dcb75 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/agent_query_plans.txt
@@ -1071,6 +1071,10 @@ Query: UPDATE connections SET smp_agent_version = ? WHERE conn_id = ?
 Plan:
 SEARCH connections USING PRIMARY KEY (conn_id=?)
 
+Query: UPDATE connections SET user_id = ? WHERE conn_id = ? and user_id = ?
+Plan:
+SEARCH connections USING PRIMARY KEY (conn_id=?)
+
 Query: UPDATE messages SET msg_body = x'' WHERE conn_id = ? AND internal_id = ?
 Plan:
 SEARCH messages USING PRIMARY KEY (conn_id=? AND internal_id=?)
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
index e9ade30f93..1f16e0fdff 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
@@ -4215,6 +4215,14 @@ Query:
 Plan:
 SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
 
+Query: 
+      UPDATE connections
+      SET user_id = ?, custom_user_profile_id = NULL, updated_at = ?
+      WHERE user_id = ? AND connection_id = ?
+    
+Plan:
+SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
+
 Query: 
       UPDATE contact_profiles
       SET contact_link = ?, updated_at = ?
diff --git a/src/Simplex/Chat/View.hs b/src/Simplex/Chat/View.hs
index 4ba5acbb43..42d1132961 100644
--- a/src/Simplex/Chat/View.hs
+++ b/src/Simplex/Chat/View.hs
@@ -1747,9 +1747,10 @@ viewConnectionIncognitoUpdated PendingContactConnection {pccConnId, customUserPr
   | otherwise = ["connection " <> sShow pccConnId <> " changed to non incognito"]
 
 viewConnectionUserChanged :: User -> PendingContactConnection -> User -> PendingContactConnection -> [StyledString]
-viewConnectionUserChanged User {localDisplayName = n} PendingContactConnection {pccConnId} User {localDisplayName = n'} PendingContactConnection {connLinkInv = connLinkInv'} =
-  case connLinkInv' of
-    Just ccLink' -> [userChangedStr <> ", new link:"] <> newLink ccLink'
+viewConnectionUserChanged User {localDisplayName = n} PendingContactConnection {pccConnId, connLinkInv} User {localDisplayName = n'} PendingContactConnection {connLinkInv = connLinkInv'} =
+  case (connLinkInv, connLinkInv') of
+    (Just ccLink, Just ccLink')
+      | ccLink /= ccLink' -> [userChangedStr <> ", new link:"] <> newLink ccLink'
     _ -> [userChangedStr]
   where
     userChangedStr = "connection " <> sShow pccConnId <> " changed from user " <> plain n <> " to user " <> plain n'
diff --git a/tests/ChatTests/Profiles.hs b/tests/ChatTests/Profiles.hs
index adff745200..433615e62a 100644
--- a/tests/ChatTests/Profiles.hs
+++ b/tests/ChatTests/Profiles.hs
@@ -1827,7 +1827,7 @@ testChangePCCUser = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     -- Create a new invite
     alice ##> "/connect"
-    _ <- getInvitation alice
+    inv <- getInvitation alice
     -- Create new user and go back to original user
     alice ##> "/create user alisa"
     showActiveUser alice "alisa"
@@ -1837,18 +1837,12 @@ testChangePCCUser = testChat2 aliceProfile bobProfile $
     showActiveUser alice "alice (Alice)"
     -- Change connection to newly created user
     alice ##> "/_set conn user :1 2"
-    alice <## "connection 1 changed from user alice to user alisa, new link:"
-    alice <## ""
-    _ <- getTermLine alice
-    alice <## ""
+    alice <## "connection 1 changed from user alice to user alisa"
     alice ##> "/user alisa"
     showActiveUser alice "alisa"
     -- Change connection back to other user
     alice ##> "/_set conn user :1 3"
-    alice <## "connection 1 changed from user alisa to user alisa2, new link:"
-    alice <## ""
-    inv <- getTermLine alice
-    alice <## ""
+    alice <## "connection 1 changed from user alisa to user alisa2"
     alice ##> "/user alisa2"
     showActiveUser alice "alisa2"
     -- Connect
@@ -1857,14 +1851,13 @@ testChangePCCUser = testChat2 aliceProfile bobProfile $
     concurrently_
       (alice <## "bob (Bob): contact is connected")
       (bob <## "alisa2: contact is connected")
-    alice <##> bob
 
 testChangePCCUserFromIncognito :: HasCallStack => TestParams -> IO ()
 testChangePCCUserFromIncognito = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     -- Create a new invite and set as incognito
     alice ##> "/connect"
-    _ <- getInvitation alice
+    inv <- getInvitation alice
     alice ##> "/_set incognito :1 on"
     alice <## "connection 1 changed to incognito"
     -- Create new user and go back to original user
@@ -1874,19 +1867,13 @@ testChangePCCUserFromIncognito = testChat2 aliceProfile bobProfile $
     showActiveUser alice "alice (Alice)"
     -- Change connection to newly created user
     alice ##> "/_set conn user :1 2"
-    alice <## "connection 1 changed from user alice to user alisa, new link:"
-    alice <## ""
-    _ <- getTermLine alice
-    alice <## ""
+    alice <## "connection 1 changed from user alice to user alisa"
     alice `hasContactProfiles` ["alice"]
     alice ##> "/user alisa"
     showActiveUser alice "alisa"
     -- Change connection back to initial user
     alice ##> "/_set conn user :1 1"
-    alice <## "connection 1 changed from user alisa to user alice, new link:"
-    alice <## ""
-    inv <- getTermLine alice
-    alice <## ""
+    alice <## "connection 1 changed from user alisa to user alice"
     alice ##> "/user alice"
     showActiveUser alice "alice (Alice)"
     -- Connect
@@ -1895,14 +1882,13 @@ testChangePCCUserFromIncognito = testChat2 aliceProfile bobProfile $
     concurrently_
       (alice <## "bob (Bob): contact is connected")
       (bob <## "alice (Alice): contact is connected")
-    alice <##> bob
 
 testChangePCCUserAndThenIncognito :: HasCallStack => TestParams -> IO ()
 testChangePCCUserAndThenIncognito = testChat2 aliceProfile bobProfile $
   \alice bob -> do
     -- Create a new invite and set as incognito
     alice ##> "/connect"
-    _ <- getInvitation alice
+    inv <- getInvitation alice
     -- Create new user and go back to original user
     alice ##> "/create user alisa"
     showActiveUser alice "alisa"
@@ -1910,10 +1896,7 @@ testChangePCCUserAndThenIncognito = testChat2 aliceProfile bobProfile $
     showActiveUser alice "alice (Alice)"
     -- Change connection to newly created user
     alice ##> "/_set conn user :1 2"
-    alice <## "connection 1 changed from user alice to user alisa, new link:"
-    alice <## ""
-    inv <- getTermLine alice
-    alice <## ""
+    alice <## "connection 1 changed from user alice to user alisa"
     alice ##> "/user alisa"
     showActiveUser alice "alisa"
     -- Change connection to incognito and make sure it's attached to the newly created user profile
@@ -1928,10 +1911,6 @@ testChangePCCUserAndThenIncognito = testChat2 aliceProfile bobProfile $
           alice <## ("bob (Bob): contact is connected, your incognito profile for this contact is " <> alisaIncognito)
           alice <## ("use /i bob to print out this incognito profile again")
       ]
-    alice ?#> "@bob hi"
-    bob <# (alisaIncognito <> "> hi")
-    bob #> ("@" <> alisaIncognito <> " hey")
-    alice ?<# "bob> hey"
 
 testChangePCCUserDiffSrv :: HasCallStack => TestParams -> IO ()
 testChangePCCUserDiffSrv ps = do
@@ -1972,7 +1951,6 @@ testChangePCCUserDiffSrv ps = do
         concurrently_
           (alice <## "bob (Bob): contact is connected")
           (bob <## "alisa: contact is connected")
-        alice <##> bob
   where
     serverCfg' =
       smpServerCfg