diff --git a/server/src/uds/core/util/unique.py b/server/src/uds/core/util/unique.py
index 25be0204..a9c15126 100644
--- a/server/src/uds/core/util/unique.py
+++ b/server/src/uds/core/util/unique.py
@@ -34,6 +34,6 @@ from __future__ import unicode_literals
 
 # Helper to acommodate all unique generators in one place
 
-from .UniqueGIDGenerator import UniqueGIDGenerator
-from .UniqueMacGenerator import UniqueMacGenerator
-from .UniqueNameGenerator import UniqueNameGenerator
+from .UniqueGIDGenerator import UniqueGIDGenerator  # @UnusedImport
+from .UniqueMacGenerator import UniqueMacGenerator  # @UnusedImport
+from .UniqueNameGenerator import UniqueNameGenerator  # @UnusedImport
diff --git a/server/src/uds/transports/SPICE/BaseSPICETransport.py b/server/src/uds/transports/SPICE/BaseSPICETransport.py
index 04dfb9b2..c2cafddc 100644
--- a/server/src/uds/transports/SPICE/BaseSPICETransport.py
+++ b/server/src/uds/transports/SPICE/BaseSPICETransport.py
@@ -44,7 +44,7 @@ from uds.services.OVirt.OVirtProvider import Provider as oVirtProvider
 import logging
 import os
 
-__updated__ = '2016-05-27'
+__updated__ = '2017-02-21'
 
 
 logger = logging.getLogger(__name__)
@@ -85,7 +85,7 @@ class BaseSpiceTransport(Transport):
         multiline=4,
         label=_('Certificate'),
         tooltip=_('Server certificate (public), can be found on your ovirt engine, probably at /etc/pki/ovirt-engine/certs/ca.der (Use the contents of this file).'),
-        required=True
+        required=False
     )
     fullScreen = gui.CheckBoxField(
         order=5,
diff --git a/server/src/uds/transports/SPICE/RemoteViewerFile.py b/server/src/uds/transports/SPICE/RemoteViewerFile.py
index 8b540b0c..8fa97b1a 100644
--- a/server/src/uds/transports/SPICE/RemoteViewerFile.py
+++ b/server/src/uds/transports/SPICE/RemoteViewerFile.py
@@ -8,7 +8,7 @@ import six
 import os
 
 
-__updated__ = '2016-05-27'
+__updated__ = '2017-02-21'
 
 
 TEMPLATE = '''[virt-viewer]
@@ -29,7 +29,7 @@ ca={ca}
 toggle-fullscreen=shift+f11
 release-cursor=shift+f12
 secure-attention=ctrl+alt+end
-secure-channels=main;inputs;cursor;playback;record;display;usbredir;smartcard
+{secure_channel}
 '''
 
 
@@ -81,6 +81,7 @@ class RemoteViewerFile(object):
             smartcard=smartcard,
             usb_auto_share=usb_auto_share,
             delete_file=delete_file,
-            host_subject=self.host_subject,
-            ca=ca
+            host_subject=self.host_subject if self.tls_port != -1 else '',
+            ca=ca if self.tls_port != -1 else '',
+            secure_channel='secure-channels=main;inputs;cursor;playback;record;display;usbredir;smartcard' if self.tls_port != -1 else ''
         )