diff --git a/code/templates/mfl b/code/templates/mfl
index d19e61f..35ad4c1 100755
--- a/code/templates/mfl
+++ b/code/templates/mfl
@@ -155,6 +155,7 @@ _upload_token() {
     -H "Secret: $MFL_TOKEN" \
     "$MFL_ROOTURL"/new_token )
     cat <<EOF
+# With password:
 curl -fL -g --upload-file "file_to_upload.ext" \\
     -H "Name: name_to_store_as.ext" \\
     -H "Max-Downloads: 10" \\
@@ -163,11 +164,8 @@ curl -fL -g --upload-file "file_to_upload.ext" \\
     -H "Password: lock_with_password" \\
     "$MFL_ROOTURL"/upload
 
-curl -fL -g --upload-file "file_to_upload.ext" \\
-    -H "Name: name_to_store_as.ext" \\
-    -H "Token: $token" \\
-    "$MFL_ROOTURL"/upload
-
+# Simplified:
+FN=file_to_upload.ext; curl -fL -g --upload-file "$FN" -H "Name: $( basename "$FN" )" -H "Token: $token" "$MFL_ROOTURL"/upload
 EOF
 }