--- loncom/interface/lonsupportreq.pm	2017/10/13 20:37:35	1.93
+++ loncom/interface/lonsupportreq.pm	2019/06/16 05:33:45	1.94
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Helpdesk request form
 #
-# $Id: lonsupportreq.pm,v 1.93 2017/10/13 20:37:35 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.94 2019/06/16 05:33:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,7 +67,9 @@ sub handler {
         }
     }
     my $origurl = $env{'form.origurl'};
-    $origurl =~ s{^https?://}{};
+    if ($origurl =~ m{^https?://[^/]+(.*)$}) {
+        $origurl =~ $1;
+    }
     $origurl =~ s/(`)//g;
     $origurl =~ s/\$/\(\$\)/g;
     my $command = $env{'form.command'};
@@ -887,7 +889,7 @@ $lt{'date'}: $reporttime
         $env{'form.'.$field} =~ s/\s+$//;
     }
     if ($env{'form.uname'} =~ /^$match_username$/) {
-        $requdom = $env{'form.udom'};
+        $requname = $env{'form.uname'};
     }
     if ($env{'form.udom'} =~ /^$match_domain$/) {
         $requdom = $env{'form.udom'};