diff --git a/10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py b/10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py
index 641e9d3c3d3821480c90c0432c892a84f0f176dc..4739c0fedbaf932579d1f95f1fc38eb390c8a939 100644
--- a/10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py
+++ b/10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py
@@ -47,9 +47,15 @@ def setup(interactive=True):
     ]
     for ftpuser in ftpincoming_users:
         login, password = ftpuser.split(':')
+        # FTP_INCOMING_USERS='user/subfolder:pass
+        if '/' in login:
+            folder = login
+            login = login.split('/')[0]
+        else:
+            folder = login
         cmds.extend([
-            'mkdir -p /home/ftp/storage/incoming/%s' % login,
-            'mkdir -p /home/ftp/storage/watchfolder/%s' % login,
+            'mkdir -p /home/ftp/storage/incoming/%s' % folder,
+            'mkdir -p /home/ftp/storage/watchfolder/%s' % folder,
             '"%s/create_ftp_account.sh" %s "%s" /home/ftp/storage/incoming/%s' % (dir_path, login, password, login),
         ])
     cmds.extend([