Merge branch 'xorg/maint'

diff --combined include/validations/names.inc.php
index 26fd292,34e0567..2060dd0
--- 1/include/validations/names.inc.php
--- 2/include/validations/names.inc.php
+++ b/include/validations/names.inc.php
@@@ -1,6 -1,6 +1,6 @@@
  <?php
  /***************************************************************************
 - *  Copyright (C) 2003-2013 Polytechnique.org                              *
 + *  Copyright (C) 2003-2014 Polytechnique.org                              *
   *  http://opensource.polytechnique.org/                                   *
   *                                                                         *
   *  This program is free software; you can redistribute it and/or modify   *
@@@ -59,6 -59,13 +59,13 @@@ class NamesReq extends ProfileValidat
                                               FROM  email_source_account
                                              WHERE  email = {?} AND type != \'alias_aux\'',
                                            $this->new_alias);
+                 if (!$used) {
+                     // Check against homonyms
+                     $used = XDB::fetchOneCell('SELECT  COUNT(email)
+                                                  FROM  email_source_other
+                                                 WHERE  email = {?}',
+                                               $this->new_alias);
+                 }
                  if ($used) {
                      $this->new_alias = null;
                  }