--- loncom/auth/lonlogin.pm	2013/09/29 00:49:24	1.157
+++ loncom/auth/lonlogin.pm	2013/11/26 03:17:09	1.158
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.157 2013/09/29 00:49:24 raeburn Exp $
+# $Id: lonlogin.pm,v 1.158 2013/11/26 03:17:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -160,11 +160,13 @@ sub handler {
     if ($sessiondata{'username'}) {
         $authusername=$sessiondata{'username'};
     } else {
+        $env{'form.username'} = &Apache::loncommon::cleanup_html($env{'form.username'});
         $authusername=($env{'form.username'}?$env{'form.username'}:'');
     }
     if ($sessiondata{'domain'}) {
         $authdomain=$sessiondata{'domain'};
-    } else { 
+    } else {
+        $env{'form.domain'} = &Apache::loncommon::cleanup_html($env{'form.domain'});
         $authdomain=($env{'form.domain'}?$env{'form.domain'}:$domain);
     }