diff --git a/interface.py b/interface.py
index 63168ba..3f94137 100644
--- a/interface.py
+++ b/interface.py
@@ -585,8 +585,6 @@ def upload():
     elif '../' in targetdir:
         abort(403)
 
-    filename = secure_filename(file.filename).strip()
-
     log.info('web: Uploading file from %s:' % request.remote_addr)
     log.info('web: - filename: ' + filename)
     log.info('web: - targetdir: ' + targetdir)
diff --git a/static/js/custom.js b/static/js/custom.js
index f4bb161..a7a7748 100644
--- a/static/js/custom.js
+++ b/static/js/custom.js
@@ -901,7 +901,7 @@ function uploadNextFile(){
         }
     });
 
-    req.addEventListener("progress", function(e){
+    req.upload.addEventListener("progress", function(e){
         if (e.lengthComputable) {
             setProgressBar(file_progress_item.progress, e.loaded / e.total);
         }