diff --git a/server/src/uds/transports/HTML5RDP/HTML5RDP.py b/server/src/uds/transports/HTML5RDP/HTML5RDP.py
index 475278a5a..773c8f10e 100644
--- a/server/src/uds/transports/HTML5RDP/HTML5RDP.py
+++ b/server/src/uds/transports/HTML5RDP/HTML5RDP.py
@@ -92,6 +92,9 @@ class HTML5RDPTransport(Transport):
         import uuid
         
         username = user.getUsernameForAuth()
+
+        if self.fixedName.value is not '':
+            username = self.fixedName.value
         
         domain = ''
         if username.find('@') != -1:
@@ -99,8 +102,6 @@ class HTML5RDPTransport(Transport):
         elif username.find('\\') != -1:
             domain, username = username.split('\\')
             
-        if self.fixedName.value is not '':
-            username = self.fixedName.value
         if self.fixedPassword.value is not '':
             password = self.fixedPassword.value
         if self.fixedDomain.value is not '':