--- loncom/auth/lonacc.pm	2006/09/12 14:45:05	1.98
+++ loncom/auth/lonacc.pm	2006/11/23 01:49:41	1.102
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.98 2006/09/12 14:45:05 albertel Exp $
+# $Id: lonacc.pm,v 1.102 2006/11/23 01:49:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -164,6 +164,7 @@ sub sso_login {
 	    # machine
 	    &Apache::lonauth::success($r,$user,$domain,$home,'noredirect');
 	    $r->internal_redirect('/adm/switchserver');
+	    $r->set_handlers('PerlHandler'=> undef);
 	} else {
 	    # need to login them in, so generate the need data that
 	    # migrate expects to do login
@@ -178,10 +179,12 @@ sub sso_login {
 					$r->dir_config('lonHostID'));
 	    $env{'form.token'} = $token;
 	    $r->internal_redirect('/adm/migrateuser');
+	    $r->set_handlers('PerlHandler'=> undef);
 	}
 	return OK;
     } elsif (defined($r->dir_config('lonSSOUserUnknownRedirect'))) {
 	$r->internal_redirect($r->dir_config('lonSSOUserUnknownRedirect'));
+	$r->set_handlers('PerlHandler'=> undef);
 	return OK;
     }
     return undef;
@@ -197,11 +200,11 @@ sub handler {
 
     my $handle;
     if ($lonid) {
-	$handle=$lonid->value;
-        $handle=~s/\W//g;
+	$handle=&LONCAPA::clean_handle($lonid->value);
     }
 
-    if (my $result = &sso_login($r,$lonid,$handle)) {
+    my $result = &sso_login($r,$lonid,$handle);
+    if (defined($result)) {
 	return $result
     }