--- loncom/auth/lonauth.pm	2013/11/26 01:19:12	1.128
+++ loncom/auth/lonauth.pm	2014/01/05 11:04:27	1.130
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.128 2013/11/26 01:19:12 raeburn Exp $
+# $Id: lonauth.pm,v 1.130 2014/01/05 11:04:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -108,11 +108,11 @@ sub success {
             }
             $desturl = &HTML::Entities::encode($desturl,'"<>&');
             $destsymb = &HTML::Entities::encode($destsymb,'"<>&');
-            $destination .= '&destinationurl='.$desturl.
+            $destination .= 'destinationurl='.$desturl.
                             '&destsymb='.$destsymb;
         } else {
             $destsymb = &HTML::Entities::encode($destsymb,'"<>&');
-            $destination .= '&destinationurl='.$destsymb;
+            $destination .= 'destinationurl='.$destsymb;
         }
     }
     if ($destination =~ m{^/adm/roles}) {
@@ -169,22 +169,31 @@ sub failed {
     }
 
     my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,$args);
-    my $uname = $form->{'uname'};
-    my $udom;
-    if (&Apache::lonnet::domain($form->{'udom'},'description') ne '') {
-        $udom = $form->{'udom'};
-    }  
-    my $retry = '/adm/login?username='.$form->{'uname'};
+    my $uname = &Apache::loncommon::cleanup_html($form->{'uname'});
+    my $udom = &Apache::loncommon::cleanup_html($form->{'udom'});
+    if (&Apache::lonnet::domain($udom,'description') eq '') {
+        undef($udom);
+    }
+    my $retry = '/adm/login';
+    if ($uname eq $form->{'uname'}) {
+        $retry .= '?username='.$uname;
+    }
     if ($udom) {
-        $retry .= '&amp;domain='.$form->{'udom'}
+        $retry .= (($retry=~/\?/)?'&amp;':'?').'domain='.$udom;
     }
     if (exists($form->{role})) {
-        $retry .= '&amp;role='.$form->{role};
+        my $role = &Apache::loncommon::cleanup_html($form->{role});
+        if ($role ne '') {
+            $retry .= (($retry=~/\?/)?'&amp;':'?').'role='.$role;
+        }
     }
     if (exists($form->{symb})) {
-        $retry .= '&amp;symb='.$form->{symb};
+        my $symb = &Apache::loncommon::cleanup_html($form->{symb});
+        if ($symb ne '') {
+            $retry .= (($retry=~/\?/)?'&amp;':'?').'symb='.$symb;
+        }
     }
-    my $end_page   = &Apache::loncommon::end_page();
+    my $end_page = &Apache::loncommon::end_page();
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     my $loginhelp = &loginhelpdisplay($udom);