--- loncom/auth/lonacc.pm	2016/08/07 20:49:37	1.159.2.3
+++ loncom/auth/lonacc.pm	2014/12/01 22:52:54	1.160
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.159.2.3 2016/08/07 20:49:37 raeburn Exp $
+# $Id: lonacc.pm,v 1.160 2014/12/01 22:52:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -109,6 +109,7 @@ sub cleanup {
     my ($r)=@_;
     if (! $r->is_initial_req()) { return DECLINED; }
     &Apache::lonnet::save_cache();
+    &Apache::lontexconvert::jsMath_reset();
     return OK;
 }
 
@@ -289,10 +290,7 @@ sub sso_login {
 	return undef;
     }
 
-    my ($user) = ($r->user =~ m/^($match_username)$/);
-    if ($user eq '') {
-        return undef;
-    }
+    my ($user) = ($r->user =~ m/([a-zA-Z0-9_\-@.]*)/);
 
     my $query = $r->args;
     my %form;
@@ -750,7 +748,7 @@ sub handler {
 # ------------------------------------ See if this is a viewable portfolio file
     if (&Apache::lonnet::is_portfolio_url($requrl)) {
         my $clientip = $r->get_remote_host();
-	my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip);
+        my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip);
 	if ($access eq 'A') {
 	    &Apache::restrictedaccess::setup_handler($r);
 	    return OK;