--- loncom/auth/switchserver.pm	2007/11/14 02:55:07	1.19
+++ loncom/auth/switchserver.pm	2007/11/15 01:17:16	1.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.19 2007/11/14 02:55:07 albertel Exp $
+# $Id: switchserver.pm,v 1.21 2007/11/15 01:17:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -115,8 +115,11 @@ sub handler {
 			    -value   => '',
 			    -expires => '-10y',);
     $r->header_out('Set-cookie' => $c);
-    $r->send_http_header;
-    return OK if $r->header_only;
+
+    if ($r->header_only) {
+	$r->send_http_header;
+	return OK;
+    }
 # -------------------------------------------------------- Menu script and info
 	   
     my $windowinfo=
@@ -138,8 +141,8 @@ sub handler {
     my $token = &Apache::lonnet::tmpput(\%info,$env{'form.otherserver'});
     my $url ='http://'.$switch_to.'/adm/login?'.
 	'domain='.$env{'user.domain'}.
-	'&username='.$env{'user.name'}.
-	'&token='.$token;
+	'&username='.$env{'user.name'}.
+	'&token='.$token;
 # --------------------------------------------------------------- Screen Output
     &Apache::lonnet::flushcourselogs();
     return &do_redirect($r,$url,0,$windowinfo);