--- loncom/interface/loncommon.pm	2006/12/01 22:19:33	1.484
+++ loncom/interface/loncommon.pm	2006/12/06 11:36:52	1.488
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.484 2006/12/01 22:19:33 albertel Exp $
+# $Id: loncommon.pm,v 1.488 2006/12/06 11:36:52 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2942,7 +2942,7 @@ sub blockcheck {
                         last;
                     }
                 }
-            } else {
+             } else {
                 if (&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) {
                     $no_ownblock = 1;
                     last;
@@ -6289,9 +6289,11 @@ sub construct_course {
 # if specified, key authority is not course, but user
 # only active if keyaccess is yes
     if ($args->{'keyauth'}) {
-	$args->{'keyauth'}=~s/[^\w\@]//g;
-	if ($args->{'keyauth'}) {
-	    $cenv{'keyauth'}=$args->{'keyauth'};
+	my ($user,$domain) = split(':',$args->{'keyauth'});
+	$user = &LONCAPA::clean_username($user);
+	$domain = &LONCAPA::clean_username($domain);
+	if ($user ne '' && $domain ne '') {
+	    $cenv{'keyauth'}=$user.':'.$domain;
 	}
     }