Merge remote-tracking branch 'origin/v4.0'

client

@@ -1 +1 @@
-Subproject commit bf97a4ad29d0223226bd40c3b58d9fb6e4118b4c
+Subproject commit 7c14b4068733aed3c040010e85ab52a975854498

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)