--- loncom/auth/switchserver.pm	2006/08/30 16:13:37	1.9
+++ loncom/auth/switchserver.pm	2006/11/23 01:49:41	1.10
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.9 2006/08/30 16:13:37 albertel Exp $
+# $Id: switchserver.pm,v 1.10 2006/11/23 01:49:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,8 +47,7 @@ sub init_env {
     my $cookie;
     if (!$lonid) { return undef; }
 
-    my $handle=$lonid->value;
-    $handle=~s/\W//g;
+    my $handle=&LONCAPA::clean_handle($lonid->value);
     my $lonidsdir=$r->dir_config('lonIDsDir');
     if ((!-e "$lonidsdir/$handle.id") || ($handle eq '')) {
 	$r->log_reason("Cookie $handle not valid", $r->filename);