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 bd2ffbc80d42161394cfcf3a6716c08436e5144f..641e9d3c3d3821480c90c0432c892a84f0f176dc 100644
--- a/10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py
+++ b/10.MediaFolder/2.Install_FTP_watch_folder/0_setup.py
@@ -23,8 +23,6 @@ def setup(interactive=True):
         'mkdir -p /home/ftp/storage',
         'mkdir -p /home/ftp/storage/incoming',
         'mkdir -p /home/ftp/storage/watchfolder',
-        'chmod -R 775 /home/ftp/storage/incoming',
-        'chmod -R 775 /home/ftp/storage/watchfolder',
         # Config
         'echo "no" > /etc/pure-ftpd/conf/AllowDotFiles',
         'echo "yes" > /etc/pure-ftpd/conf/CallUploadScript',
@@ -51,10 +49,12 @@ def setup(interactive=True):
         login, password = ftpuser.split(':')
         cmds.extend([
             'mkdir -p /home/ftp/storage/incoming/%s' % login,
+            'mkdir -p /home/ftp/storage/watchfolder/%s' % login,
             '"%s/create_ftp_account.sh" %s "%s" /home/ftp/storage/incoming/%s' % (dir_path, login, password, login),
         ])
     cmds.extend([
         'chmod -R 775 /home/ftp/storage/incoming',
+        'chmod -R 775 /home/ftp/storage/watchfolder',
         'chown -R ftp:ftp /home/ftp/storage',
         'rm -f pureftpd.passwd.tmp',
         'pure-pw mkdb',