diff --git a/5.MediaServer/3.Deploy_demokit/0_setup.py b/5.MediaServer/3.Deploy_demokit/0_setup.py
index cc05d6a9d00648f1ce73dce5a5f57f05907cf430..1d2249ac529a121c8946fba9390c8870b09b004e 100644
--- a/5.MediaServer/3.Deploy_demokit/0_setup.py
+++ b/5.MediaServer/3.Deploy_demokit/0_setup.py
@@ -3,6 +3,7 @@
 import utils
 import json
 import subprocess
+import os
 
 CONTENT = [
     "https://www.ubicast.eu/media/downloads/TradeshowDemoKit/medical_education.zip",
@@ -12,41 +13,43 @@ CONTENT = [
 
 def setup(interactive=True):
     cmds = list()
-    options = {
-        "ms_url": utils.get_conf('MS_SERVER_NAME'),
-        "ms_apikey": utils.get_conf('MS_API_KEY')
-    }
-    cmd_template = "./publish_zip_by_url.py -w https://{ms_url} -u %s -a {ms_apikey}".format(**options)
-    #https://192.168.43.72/api/v2/search/?search=medical
-    for c in CONTENT:
-        cmd = cmd_template % c
-        cmds.append(cmd)
+    if os.path.exists('/etc/nginx/sites-enabled/mediaserver-msuser.conf'):
+        options = {
+            "ms_url": utils.get_conf('MS_SERVER_NAME'),
+            "ms_apikey": utils.get_conf('MS_API_KEY')
+        }
+        cmd_template = "./publish_zip_by_url.py -w https://{ms_url} -u %s -a {ms_apikey}".format(**options)
+        #https://192.168.43.72/api/v2/search/?search=medical
+        for c in CONTENT:
+            cmd = cmd_template % c
+            cmds.append(cmd)
 
-    with open('/etc/miris/netcapture.json', 'r') as f:
-        c = json.load(f)
-    c['campusmanager_check_ssl'] = False
-    with open('/etc/miris/netcapture.json', 'w') as f:
-        json.dump(c, f)
-
-    cmds.append('rsync -r mirisconf/ /etc/miris/conf')
-    cmds.append('chgrp -R video /etc/miris/conf')
-    cmds.append('chmod -R 774 /etc/miris/conf')
-    # start netcapture without hw accel
-    if subprocess.getstatusoutput("netcapturectl ls")[0] != 0:
-        print('Pulling netcapture image, please wait')
-        cmds.append('netcapturectl add')
-    utils.run_commands(cmds)
-
-    cmds = list()
-    # try to enable hw accel if available
-    subprocess.getstatusoutput("apt install -y vainfo")
-    if subprocess.getstatusoutput("vainfo")[0] == 0:
-        # hw acceleration requires boot-time module options so a reboot will be needed
-        c['enable_hw_acceleration'] = True
-        if subprocess.getstatusoutput('dmesg | grep "GuC: Loaded"')[0] != 0:
-            cmds.append('echo "options i915 enable_guc_loading=1 enable_guc_submission=1" > /etc/modprobe.d/netcapture.conf')
-            cmds.append('update-initramfs -u')
-            print('A reboot is required')
+    if os.path.exists('/etc/miris/netcapture.json'):
+        with open('/etc/miris/netcapture.json', 'r') as f:
+            c = json.load(f)
+        c['campusmanager_check_ssl'] = False
         with open('/etc/miris/netcapture.json', 'w') as f:
             json.dump(c, f)
-    utils.run_commands(cmds)
+
+        cmds.append('rsync -r mirisconf/ /etc/miris/conf')
+        cmds.append('chgrp -R video /etc/miris/conf')
+        cmds.append('chmod -R 774 /etc/miris/conf')
+        # start netcapture without hw accel
+        if subprocess.getstatusoutput("netcapturectl ls")[0] != 0:
+            print('Pulling netcapture image, please wait')
+            cmds.append('netcapturectl add')
+        utils.run_commands(cmds)
+
+        cmds = list()
+        # try to enable hw accel if available
+        subprocess.getstatusoutput("apt install -y vainfo")
+        if subprocess.getstatusoutput("vainfo")[0] == 0:
+            # hw acceleration requires boot-time module options so a reboot will be needed
+            c['enable_hw_acceleration'] = True
+            if subprocess.getstatusoutput('dmesg | grep "GuC: Loaded"')[0] != 0:
+                cmds.append('echo "options i915 enable_guc_loading=1 enable_guc_submission=1" > /etc/modprobe.d/netcapture.conf')
+                cmds.append('update-initramfs -u')
+                print('A reboot is required')
+            with open('/etc/miris/netcapture.json', 'w') as f:
+                json.dump(c, f)
+        utils.run_commands(cmds)