diff --git a/server/src/uds/transports/HTML5RDP/HTML5RDP.py b/server/src/uds/transports/HTML5RDP/HTML5RDP.py
index 475278a5..773c8f10 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 '':
diff --git a/server/src/uds/web/views.py b/server/src/uds/web/views.py
index 6e9f61c4..6ca6d7c8 100644
--- a/server/src/uds/web/views.py
+++ b/server/src/uds/web/views.py
@@ -191,6 +191,8 @@ def index(request):
         
     logger.debug('Services: {0}'.format(services))
     
+    services = sorted(services, key=lambda s: s['name'])
+    
     if len(services) == 1 and GlobalConfig.AUTORUN_SERVICE.get(True) == '1' and len(services[0]['transports']) > 0:
         if request.session.get('autorunDone', '0') == '0':
             request.session['autorunDone'] = '1'