diff --git a/client b/client
index bf97a4ad2..7c14b4068 160000
--- a/client
+++ b/client
@@ -1 +1 @@
-Subproject commit bf97a4ad29d0223226bd40c3b58d9fb6e4118b4c
+Subproject commit 7c14b4068733aed3c040010e85ab52a975854498
diff --git a/server/src/uds/web/views/service.py b/server/src/uds/web/views/service.py
index 993d5d370..907747384 100644
--- a/server/src/uds/web/views/service.py
+++ b/server/src/uds/web/views/service.py
@@ -249,6 +249,9 @@ def update_transport_ticket(
                 data.get('password', None) or None
             )  # If password is empty, set it to None
             domain = data.get('domain', None) or None  # If empty string, set to None
+            if domain and '.' in domain:
+                username = f'{username}@{domain}'
+                domain = None
 
             if password:
                 password = CryptoManager().symmetric_encrypt(password, scrambler)