--- loncom/auth/lonlogin.pm	2013/01/11 17:35:10	1.153
+++ loncom/auth/lonlogin.pm	2013/01/28 02:00:58	1.155
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.153 2013/01/11 17:35:10 raeburn Exp $
+# $Id: lonlogin.pm,v 1.155 2013/01/28 02:00:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -636,8 +636,10 @@ sub contactdisplay {
     my $requestmail = 
         &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
                                                  $authdomain,$origmail);
-    if ($showhelpdesk) {
-        unless ($requestmail =~ m/[^\@]+\@[^\@]+/) {
+    unless ($showhelpdesk eq '0') {
+        if ($requestmail =~ m/[^\@]+\@[^\@]+/) {
+            $showhelpdesk = 1;
+        } else {
             $showhelpdesk = 0;
         }
     }
@@ -652,7 +654,8 @@ sub contactdisplay {
 <script type="text/javascript">
 // <![CDATA[
 function helpdesk() {
-    var codedom = document.client.udom.value;
+    var possdom = document.client.udom.value;
+    var codedom = possdom.replace( new RegExp("[^A-Za-z0-9.\\-]","g"),'');
     if (codedom == '') {
         codedom = "$authdomain";
     }