diff --git a/uptracker.cgi b/uptracker.cgi
index ff18fcd6f..bfea70045 100755
--- a/uptracker.cgi
+++ b/uptracker.cgi
@@ -33,7 +33,7 @@ if ($in{'uid'}) {
 	$upfile = "$uinfo[7]/.tmp/upload.$id";
 	}
 else {
-	$upfile = &tempname_dir()."/upload.$id";
+	$upfile = "$ENV{'WEBMIN_VAR'}/uploads/upload.$id";
 	}
 
 # Read the tracker file in a loop until done, or until 1 minute has passed
diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index a4f9b8aeb..4fea01e2c 100755
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -1071,10 +1071,10 @@ if ($<) {
 	$vardir = "$uinfo[7]/.tmp";
 	}
 else {
-	$vardir = &tempname_dir();
+	$vardir = "$ENV{'WEBMIN_VAR'}/uploads";
 	}
 if (!-d $vardir) {
-	&make_dir($vardir, 0755);
+	&make_dir($vardir, 0750);
 	}
 
 # Remove any upload.* files more than 1 hour old