--- loncom/auth/lonshibacc.pm	2012/03/05 20:51:29	1.1
+++ loncom/auth/lonshibacc.pm	2015/01/23 15:57:27	1.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Authorization handler for Shibboleth authenticated users
 #
-# $Id: lonshibacc.pm,v 1.1 2012/03/05 20:51:29 raeburn Exp $
+# $Id: lonshibacc.pm,v 1.2 2015/01/23 15:57:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,7 +72,7 @@ sub handler {
         if ($udom ne '') {
             my $uprimary_id = &Apache::lonnet::domain($udom,'primary');
             my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);
-            if ($user =~ /^(\w+)\@\Q$uint_dom\E$/i) {
+            if ($user =~ /^(\w[a-zA-Z0-9_\-.]+)\@\Q$uint_dom\E$/i) {
                 my $username = $1;
                 $user = $r->user($username);
             }