--- loncom/interface/lonsupportreq.pm	2017/01/23 19:57:30	1.79.2.3
+++ loncom/interface/lonsupportreq.pm	2017/10/15 03:43:52	1.79.2.3.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Helpdesk request form
 #
-# $Id: lonsupportreq.pm,v 1.79.2.3 2017/01/23 19:57:30 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.79.2.3.2.1 2017/10/15 03:43:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -662,9 +662,6 @@ sub print_request_receipt {
     my $admin = $Apache::lonnet::perlvar{'lonAdminMail'};
     my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
     my $defdom = &get_domain();
-    my ($to,$bcc,$addtext) =
-        &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
-                                                 $defdom,$origmail);
     my $from = $admin;
     my %helpform;
     my %domconfig =
@@ -878,6 +875,33 @@ $lt{'date'}: $reporttime
             }
         }
     }
+
+    my ($requname,$requdom,$reqemail);
+    foreach my $field ('uname','udom','email') {
+        $env{'form.'.$field} =~ s/^\s+//;
+        $env{'form.'.$field} =~ s/\s+$//;
+    }
+    if ($env{'form.uname'} =~ /^$match_username$/) {
+        $requdom = $env{'form.udom'};
+    }
+    if ($env{'form.udom'} =~ /^$match_domain$/) {
+        $requdom = $env{'form.udom'};
+    }
+    if ($env{'form.email'} =~ m/^[^\@]+\@[^\@]+$/) {
+        $reqemail = $env{'form.email'};
+    }
+
+    my $dom_in_effect;
+    unless ($env{'user.domain'} eq 'public') {
+        $dom_in_effect = $env{'user.domain'};
+    }
+    if ($dom_in_effect eq '') {
+        $dom_in_effect = $requdom;
+    }
+    if ($dom_in_effect eq '') {
+        $dom_in_effect = $defdom;
+    }
+
     $displaymsg .= '<span class="LC_helpform_receipt_cat">'.
                    $lt{'date'}.'</span>: '.$reporttime.'<br />'."\n";
 
@@ -900,6 +924,11 @@ END
         &print_header($r,$url,'process');
     }
     my $bad_email = 0;
+    my ($to,$bcc,$addtext) =
+        &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
+                                                 $dom_in_effect,$origmail,
+                                                 $requname,$requdom,
+                                                 $reqemail);
     if ($to =~ /,/) {
         my @ok_email; 
         foreach my $email (split(/,/,$to)) {
@@ -937,12 +966,8 @@ END
     }
     $r->print(&Apache::loncommon::confirmwrapper($message));
 
-    if (defined($env{'form.email'})) {
-        $env{'form.email'} =~ s/^\s+//;
-        $env{'form.email'} =~ s/\s+$//;
-        if ($env{'form.email'} =~ m/^[^\@]+\@[^\@]+$/) {
-            $from = $env{'form.email'};
-        }
+    if ($reqemail ne '') {
+        $from = $reqemail;
     }
 
     if (defined($env{'form.cc'})) {