--- loncom/interface/lonhelpmenu.pm	2004/08/14 01:14:58	1.10
+++ loncom/interface/lonhelpmenu.pm	2004/09/13 13:31:52	1.11
@@ -128,7 +128,7 @@ END
         $r->print('
   <image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Topic help)" valign="middle" />&nbsp;Topic help</a></b>&nbsp;</td>');
     }
-    if ($requestmail) {
+    if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print('
             <td align="center">&nbsp;<b><a href="/adm/support?origurl='.&Apache::lonnet::escape($origurl).'&function='.$function.'" target="bodyframe"><image src="/adm/lonIcons/helpdesk.gif" border="0" alt="(Ask helpdesk)" valign="middle" />&nbsp;Ask helpdesk</a></b>&nbsp;</td>');
     }
@@ -209,7 +209,7 @@ sub display_help_mainpage {
 $bodytag
 END
     $r->print($lt{'chen'});
-    if ($requestmail) {
+    if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print(', '.$lt{'orto'});
     } else {
         $r->print(".");
@@ -231,13 +231,12 @@ END
             }
         }
     }
-    if ($requestmail) {
+    if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print("
           <ul>
            <li><a href=\"/adm/support?origurl=".&Apache::lonnet::escape($origurl)."&function=$function\">$lt{'cont'}</a></li>
           </ul>
           <p>$lt{'suhr'}</p>
-          <ul>
         ");
     }
     if ($faqbaseurl && $ENV{'user.adv'}) {
@@ -245,6 +244,7 @@ END
             $faq = '1';
         }
         $r->print("
+          <ul>
            <li><a href=\"$faqbaseurl/fom/cache/$faq.html\">$lt{'faqo'}</a></li>
           </ul>
           <p>$lt{'tfaq'}</p>