--- loncom/lonnet/perl/lonnet.pm	2017/08/11 00:25:30	1.1349
+++ loncom/lonnet/perl/lonnet.pm	2017/08/23 22:38:43	1.1350
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1349 2017/08/11 00:25:30 raeburn Exp $
+# $Id: lonnet.pm,v 1.1350 2017/08/23 22:38:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3694,12 +3694,12 @@ sub userfileupload {
                          '_'.$env{'user.domain'}.'/pending';
         } elsif (($context eq 'existingfile') || ($context eq 'canceloverwrite')) {
             my ($docuname,$docudom);
-            if ($destudom) {
+            if ($destudom =~ /^$match_domain$/) {
                 $docudom = $destudom;
             } else {
                 $docudom = $env{'user.domain'};
             }
-            if ($destuname) {
+            if ($destuname =~ /^$match_username$/) {
                 $docuname = $destuname;
             } else {
                 $docuname = $env{'user.name'};