--- loncom/interface/lonsupportreq.pm	2004/09/09 05:58:42	1.8
+++ loncom/interface/lonsupportreq.pm	2004/09/13 13:31:52	1.9
@@ -544,17 +544,29 @@ Date/Time: $reporttime
 $bodytag
  <h3>A support request has been sent to $to</h3>
 END
-    } else { 
-        $r->print(<<END);
+    } else {
+        $to = $admin;
+        if ($to =~ m/^[^\@]+\@[^\@]+$/) {
+            $r->print(<<END);
+<html>
+<head>
+ <title>LON-CAPA support request recorded</title>
+</head>
+$bodytag
+ <h3>A support request has been sent to $to</h3>
+END
+        } else {
+            $r->print(<<END);
 <html>
 <head>
  <title>LON-CAPA support request recorded</title>
 </head>
 $bodytag
  <h3>Warning: Problem with support e-mail address</h3>
-As the e-mail address provided for this LON-CAPA server ($to) does not appear to be a valid e-mail address, your support request has <b>not</b> been sent to the LON-CAPA support staff at your institution. Instead a copy has been sent to the LON-CAPA support team at Michigan State University. 
+As the e-mail address provided for this LON-CAPA server ($to) does not appear to be a valid e-mail address, your support request has <b>not</b> been sent to the LON-CAPA support staff or administrator at your institution. Instead a copy has been sent to the LON-CAPA support team at Michigan State University. 
 END
-        $to = 'helpdesk@lon-capa.org';
+            $to = 'helpdesk@lon-capa.org';
+        }
     }
     if (defined($ENV{'form.email'})) {
         if ($ENV{'form.email'} =~ m/^[^\@]+\@[^\@]+$/) {
