diff --git a/server/src/uds/transports/RDP/RDPTransport.py b/server/src/uds/transports/RDP/RDPTransport.py
index da4d7eed3..c6ddf386a 100644
--- a/server/src/uds/transports/RDP/RDPTransport.py
+++ b/server/src/uds/transports/RDP/RDPTransport.py
@@ -163,6 +163,7 @@ class RDPTransport(Transport):
         else:
             domain = ''
         username = proc[0]
+        
         if self._fixedName is not '':
             username = self._fixedName
         if self._fixedPassword is not '':
@@ -171,6 +172,11 @@ class RDPTransport(Transport):
             domain = self._fixedDomain;
         if self._useEmptyCreds is True:
             username, password, domain = '','',''
+            
+        if domain != '':
+            if domain.find('.') == -1: # Dotter domain form
+                username = username + '@' + domain
+                domain = ''
         
         width, height = CommonPrefs.getWidthHeight(prefs)
         depth = CommonPrefs.getDepth(prefs)
diff --git a/server/src/uds/transports/RDP/TSRDPTransport.py b/server/src/uds/transports/RDP/TSRDPTransport.py
index 1e21bdbc8..fa18e9187 100644
--- a/server/src/uds/transports/RDP/TSRDPTransport.py
+++ b/server/src/uds/transports/RDP/TSRDPTransport.py
@@ -161,6 +161,11 @@ class TSRDPTransport(Transport):
         if self._useEmptyCreds is True:
             username, password, domain = '','',''
         
+        if domain != '':
+            if domain.find('.') == -1: # Dotter domain form
+                username = username + '@' + domain
+                domain = ''
+        
         width, height = CommonPrefs.getWidthHeight(prefs)
         depth = CommonPrefs.getDepth(prefs)
         cache = Cache('pam')