--- loncom/auth/switchserver.pm	2015/01/08 21:18:29	1.33
+++ loncom/auth/switchserver.pm	2015/01/22 22:45:06	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.33 2015/01/08 21:18:29 raeburn Exp $
+# $Id: switchserver.pm,v 1.34 2015/01/22 22:45:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -160,9 +160,15 @@ sub handler {
     my %temp=('switchserver' => time.':'.$env{'form.otherserver'},
 	      $env{'form.role'});
     &Apache::lonnet::put('email_status',\%temp);
+    my $logmsg = "Switch Server to $env{'form.otherserver'}";
+    if ($env{'form.role'}) {
+        $logmsg .= " with role: $env{'form.role'}";
+    } else {
+        $logmsg .= " (no role)";
+    }
+    $logmsg .= ' '.$ENV{'REMOTE_ADDR'};
     &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
-			 $env{'user.home'},
-			 "Switch Server to $env{'form.otherserver'} with role $env{'form.role'} $ENV{'REMOTE_ADDR'}");
+			 $env{'user.home'},$logmsg);
 
     &Apache::loncommon::content_type($r,'text/html');