Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.745.2.23
diff -u -p -F^f -r1.745.2.23 user.module
--- modules/user/user.module	6 Dec 2007 19:49:14 -0000	1.745.2.23
+++ modules/user/user.module	10 Dec 2007 17:39:13 -0000
@@ -260,7 +260,7 @@ function user_validate_name($name) {
   if (substr($name, 0, 1) == ' ') return t('The username cannot begin with a space.');
   if (substr($name, -1) == ' ') return t('The username cannot end with a space.');
   if (strpos($name, '  ') !== FALSE) return t('The username cannot contain multiple spaces in a row.');
-  if (ereg("[^\x80-\xF7 [:alnum:]@_.-]", $name)) return t('The username contains an illegal character.');
+  if (ereg("[^\x80-\xF7 [:alnum:]@_.-\']", $name)) return t('The username contains an illegal character.');
   if (preg_match('/[\x{80}-\x{A0}'.          // Non-printable ISO-8859-1 + NBSP
                    '\x{AD}'.                 // Soft-hyphen
                    '\x{2000}-\x{200F}'.      // Various space characters
Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.145.2.7
diff -u -p -F^f -r1.145.2.7 bootstrap.inc
--- includes/bootstrap.inc	28 Oct 2007 04:53:14 -0000	1.145.2.7
+++ includes/bootstrap.inc	10 Dec 2007 17:39:14 -0000
@@ -628,7 +628,7 @@ function referer_uri() {
  * Encode special characters in a plain-text string for display as HTML.
  */
 function check_plain($text) {
-  return htmlspecialchars($text, ENT_QUOTES);
+  return htmlspecialchars($text, ENT_NOQUOTES);
 }
 
 /**