diff --git a/projects/samskivert/src/java/com/samskivert/net/MailUtil.java b/projects/samskivert/src/java/com/samskivert/net/MailUtil.java
index 63bfc43c..eea9dc80 100644
--- a/projects/samskivert/src/java/com/samskivert/net/MailUtil.java
+++ b/projects/samskivert/src/java/com/samskivert/net/MailUtil.java
@@ -1,5 +1,5 @@
 //
-// $Id: MailUtil.java,v 1.5 2002/05/02 01:13:35 shaper Exp $
+// $Id: MailUtil.java,v 1.6 2003/08/15 22:35:57 mdb Exp $
 //
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001 Michael Bayne
@@ -23,8 +23,8 @@ package com.samskivert.net;
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import org.apache.regexp.RE;
-import org.apache.regexp.RESyntaxException;
+import java.util.regex.PatternSyntaxException;
+import java.util.regex.Pattern;
 
 import com.samskivert.Log;
 
@@ -80,7 +80,7 @@ public class MailUtil
      */
     public static boolean isValidAddress (String address)
     {
-        return _emailre.match(address);
+        return _emailre.matcher(address).matches();
     }
 
     public static void main (String[] args)
@@ -96,13 +96,14 @@ public class MailUtil
     protected static final String EMAIL_REGEX = "^([-A-Za-z0-9_.!%+]+@" +
         "[-a-zA-Z0-9]+(\\.[-a-zA-Z0-9]+)*\\.[-a-zA-Z0-9]+)$";
 
-    /** Used to check email addresses for validity. */
-    protected static RE _emailre;
+    /** A compiled version of our email regular expression. */
+    protected static Pattern _emailre;
     static {
-	try {
-	    _emailre = new RE(EMAIL_REGEX);
-	} catch (RESyntaxException rese) {
-	    Log.warning("Unable to initialize email regexp?! " + rese);
-	}
+        try {
+            _emailre = Pattern.compile(EMAIL_REGEX);
+        } catch (PatternSyntaxException pse) {
+            Log.warning("Unable to initialize email regexp?!");
+            Log.logStackTrace(pse);
+        }
     }
 }
diff --git a/projects/samskivert/src/java/com/samskivert/servlet/user/UserRepository.java b/projects/samskivert/src/java/com/samskivert/servlet/user/UserRepository.java
index 3618a05c..76612eed 100644
--- a/projects/samskivert/src/java/com/samskivert/servlet/user/UserRepository.java
+++ b/projects/samskivert/src/java/com/samskivert/servlet/user/UserRepository.java
@@ -1,5 +1,5 @@
 //
-// $Id: UserRepository.java,v 1.24 2002/11/01 00:43:58 mdb Exp $
+// $Id: UserRepository.java,v 1.25 2003/08/15 22:35:57 mdb Exp $
 //
 // samskivert library - useful routines for java programs
 // Copyright (C) 2001 Michael Bayne
@@ -30,9 +30,6 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Properties;
 
-import org.apache.regexp.RE;
-import org.apache.regexp.RESyntaxException;
-
 import com.samskivert.Log;
 import com.samskivert.io.PersistenceException;
 import com.samskivert.jdbc.ConnectionProvider;
@@ -137,7 +134,8 @@ public class UserRepository extends JORARepository
 	}
 
 	// check that it's only valid characters
-	if (!_userre.match(username)) {
+	if (!username.matches("^[_A-Za-z0-9]+$")) {
+            Log.info("Mismatch " + username + ".");
 	    throw new InvalidUsernameException("error.invalid_username");
 	}
 
@@ -513,16 +511,6 @@ public class UserRepository extends JORARepository
 
     protected Table _utable;
 
-    /** Used to check usernames for invalid characteres. */
-    protected static RE _userre;
-    static {
-	try {
-	    _userre = new RE("^[_A-Za-z0-9]+$");
-	} catch (RESyntaxException rese) {
-	    Log.warning("Unable to initialize user regexp?! " + rese);
-	}
-    }
-
     /** The minimum allowable length of a username. */
     protected static final int MINIMUM_USERNAME_LENGTH = 3;
 }