--- loncom/auth/lonroles.pm	2005/09/16 19:47:42	1.129
+++ loncom/auth/lonroles.pm	2005/10/24 21:32:42	1.130
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.129 2005/09/16 19:47:42 albertel Exp $
+# $Id: lonroles.pm,v 1.130 2005/10/24 21:32:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -479,11 +479,7 @@ ENDHEADER
 		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                     if (!$allowed) {
 			$button=0;
-                        $switchserver=&Apache::lonnet::escape('http://'.
-                         $Apache::lonnet::hostname{$home}.
-                         '/adm/login?domain='.$env{'user.domain'}.
-			  '&username='.$env{'user.name'}.
-                          '&firsturl=/priv/'.$trest.'/');
+                        $switchserver='otherserver='.$home.'&role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
                     $home = $Apache::lonnet::hostname{$home};
@@ -772,7 +768,7 @@ sub build_roletext {
     unless ($nochoose) {
         if (!$button) {
             if ($switchserver) {
-                $roletext.='<td><a href="/adm/logout?handover='.
+                $roletext.='<td><a href="/adm/switchserver?'.
                 $switchserver.'">'.&mt('Switch Server').'</a></td>';
             } else {
                 $roletext.=('<td>&nbsp;</td>');