diff --git a/admin/mail_invalide/mail_invalide.py b/admin/mail_invalide/mail_invalide.py
index 808c30dd..99b0bc3e 100755
--- a/admin/mail_invalide/mail_invalide.py
+++ b/admin/mail_invalide/mail_invalide.py
@@ -55,7 +55,7 @@ def generate_ps(proprio):
         template = template.replace('~prenom~', proprio.prenom().encode('utf-8'))
         template = template.replace('~nom~', proprio.nom().encode('utf-8'))
         template = template.replace('~chambre~', proprio.chbre().encode('utf-8'))
-        template = template.replace('~mail~', proprio.email().encode('utf-8'))
+        template = template.replace('~mail~', proprio.email().encode('utf-8').replace('_', '\\_'))
         template = template.replace('~fin~',
             time.strftime(format_date, time.localtime(time.time()+14*86400)))
 
diff --git a/gestion/ldap_crans.py b/gestion/ldap_crans.py
index 293c87ff..1f40228c 100644
--- a/gestion/ldap_crans.py
+++ b/gestion/ldap_crans.py
@@ -2050,7 +2050,7 @@ class Adherent(BaseProprietaire):
         if valeur == False:
             # On enlève les blacklistes
             bl_mail_list = [x for x in self.blacklist() if 'mail_invalide' in x]
-            now = time.time()
+            now = int(time.time())
             for bl_mail in bl_mail_list:
                 bl_data = bl_mail.split('$')
                 if int(bl_data[0]) <= now and bl_data[1] == '-':
@@ -2059,6 +2059,9 @@ class Adherent(BaseProprietaire):
                 elif int(bl_data[0]) >= now:
                     self.blacklist((self.blacklist().index(bl_mail),
                             [str(now-2), str(now-1), 'mail_invalide', bl_data[3]]))
+                    # Sale, mais évite d'avoir plusieurs blacklistes sur les mêmes dates
+                    now -= 2
+
         elif valeur == None:
             # On retourne l'existence d'une blackliste active ou future
             bl_mail_list = [x for x in self.blacklist() if 'mail_invalide' in x]
@@ -2068,6 +2071,7 @@ class Adherent(BaseProprietaire):
                 if (int(bl_data[0]) <= now and bl_data[1] == '-') or int(bl_data[0]) >= now:
                     return True
             return False
+
         else:
             raise ValueError, u'mail_invalide ne peut prendre que None ou False en argument'