--- loncom/lonnet/perl/lonnet.pm	2005/01/28 09:26:57	1.591
+++ loncom/lonnet/perl/lonnet.pm	2005/01/31 11:27:14	1.592
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.591 2005/01/28 09:26:57 albertel Exp $
+# $Id: lonnet.pm,v 1.592 2005/01/31 11:27:14 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3576,9 +3576,12 @@ sub modifyuser {
     if (defined($middle)) { $names{'middlename'} = $middle; }
     if ($last)   { $names{'lastname'}   = $last; }
     if (defined($gene))   { $names{'generation'} = $gene; }
-    if ($email)  { $names{'notification'} = $email;
-                   $names{'critnotification'} = $email; }
-
+    if ($email) {
+       $email=~s/[^\w\@\.\-\,]//gs;
+       if ($email=~/\@/) { $names{'notification'} = $email;
+			   $names{'critnotification'} = $email;
+			   $names{'permanentemail'} = $email; }
+    }
     my $reply = &put('environment', \%names, $udom,$uname);
     if ($reply ne 'ok') { return 'error: '.$reply; }
     &logthis('Success modifying user '.$udom.', '.$uname.', '.$uid.', '.