--- loncom/auth/switchserver.pm	2010/09/06 15:44:05	1.30
+++ loncom/auth/switchserver.pm	2013/09/29 00:49:24	1.32
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.30 2010/09/06 15:44:05 raeburn Exp $
+# $Id: switchserver.pm,v 1.32 2013/09/29 00:49:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -115,7 +115,7 @@ sub handler {
                 if (&Apache::lonnet::homeserver($env{'user.name'},$env{'user.domain'}) eq $env{'form.otherserver'}) {
                     $skip_canhost_check = 1;
                 }
-            } elsif ($env{'form.role'} =~ m{^[ac]a\./($match_domain)/($match_username)/$}) {
+            } elsif ($env{'form.role'} =~ m{^[ac]a\./($match_domain)/($match_username)$}) {
                 if (&Apache::lonnet::homeserver($2,$1) eq $env{'form.otherserver'}) {
                     $skip_canhost_check = 1; 
                 }
@@ -173,11 +173,13 @@ sub handler {
 	   
 # ---------------------------------------------------------------- Get handover
 
+    my ($is_balancer) = &Apache::lonnet::check_loadbalancing($env{'user.name'},$env{'user.domain'});
     my %info=('ip'       => $ENV{'REMOTE_ADDR'},
 	      'domain'   => $env{'user.domain'},
 	      'username' => $env{'user.name'},
 	      'role'     => $env{'form.role'},
-	      'server'   => $r->dir_config('lonHostID'));
+	      'server'   => $r->dir_config('lonHostID'),
+	      'balancer' => $is_balancer);
     if ($env{'form.origurl'}) {
         $info{'origurl'} = $env{'form.origurl'};
     }