diff --git a/gestion/mail/template/upload_hard/body/en b/gestion/mail/template/upload_hard/body/en
index 2fd590ae..7ed8f068 100644
--- a/gestion/mail/template/upload_hard/body/en
+++ b/gestion/mail/template/upload_hard/body/en
@@ -1,4 +1,4 @@
-Greetings {{proprio}},
+Greetings {{ proprio|name }},
 
 Your upload bandwith has been temporarily limited due to a massive upload from your computers to outer networks. ({{upload}} on the last 24 hours)
 
diff --git a/gestion/mail/template/upload_hard/body/fr b/gestion/mail/template/upload_hard/body/fr
index ba9b49ef..3230fe02 100644
--- a/gestion/mail/template/upload_hard/body/fr
+++ b/gestion/mail/template/upload_hard/body/fr
@@ -1,4 +1,4 @@
-Bonjour {{proprio}},
+Bonjour {{ proprio|name }},
 
 Le débit de votre connexion internet a été temporairement limité car vos machines envoient trop de données vers des machines hors du réseau du Crans ({{upload}} Mo en 24h).
 
diff --git a/gestion/mail/template/upload_notif/body/fr b/gestion/mail/template/upload_notif/body/fr
index f9938cf5..c1ff26c6 100644
--- a/gestion/mail/template/upload_notif/body/fr
+++ b/gestion/mail/template/upload_notif/body/fr
@@ -1,4 +1,4 @@
-{{proprio}} ({{id}}) a été limité en débit montant du fait d'un
+{{ proprio|name }} ({{id}}) a été limité en débit montant du fait d'un
 upload excessif ({{upload}} Mio).
 
 Ses machines ont été aperçues pour la dernière fois à ces endroits :
diff --git a/gestion/mail/template/upload_soft/body/en b/gestion/mail/template/upload_soft/body/en
index e1991c3c..8b6f47ed 100644
--- a/gestion/mail/template/upload_soft/body/en
+++ b/gestion/mail/template/upload_soft/body/en
@@ -1,4 +1,4 @@
-Hi {{proprio}},
+Hi {{ proprio|name }},
 
 This email notifies you that your computer(s) send(s) a big amount of data out
 of the Crans network ({{upload}} MB within the last 24h).
diff --git a/gestion/mail/template/upload_soft/body/fr b/gestion/mail/template/upload_soft/body/fr
index 3863fdec..bf3b4bb4 100644
--- a/gestion/mail/template/upload_soft/body/fr
+++ b/gestion/mail/template/upload_soft/body/fr
@@ -1,4 +1,4 @@
-Bonjour {{proprio}},
+Bonjour {{ proprio|name }},
 
 Nous t'informons que ta (tes) machine(s) envoie(nt) une quantité importante de
 données vers l'extérieur ({{upload}} Mo en 24 heures).
diff --git a/surveillance/deconnexion2.py b/surveillance/deconnexion2.py
index 94fba181..d766733c 100755
--- a/surveillance/deconnexion2.py
+++ b/surveillance/deconnexion2.py
@@ -229,12 +229,9 @@ def upload_hard(proprio, elupload, elid, eltype, curseur, ldap):
 
     mail_data = {
         'from': upload.expediteur,
-        'to': unicode(proprio['mail'][0]),
+        'to': unicode(proprio.get_mail()),
         'upload': "%.2f" % (elupload,),
-        'proprio': u" ".join([
-            unicode(proprio.get('prenom', [u''])[0]),
-            unicode(proprio.get('nom', [u''])[0]),
-        ]),
+        'proprio': proprio,
         'lang_info': 'English version below',
         'mdc': mdcf,
         'chambre': unicode(proprio.get('chbre', [u'????'])[0]),
@@ -291,7 +288,7 @@ def upload_hard(proprio, elupload, elid, eltype, curseur, ldap):
     with mail_module.ServerConnection() as smtp_conn:
         corps = mail_module.generate('upload_hard', mail_data).as_string()
         if not DEBUG:
-            smtp_conn.sendmail(upload.expediteur, unicode(proprio['mail'][0]), corps)
+            smtp_conn.sendmail(upload.expediteur, unicode(proprio.get_mail()), corps)
         else:
             print corps
 
@@ -327,10 +324,10 @@ def upload_hard(proprio, elupload, elid, eltype, curseur, ldap):
                 'from': upload.expediteur,
                 'to': upload.expediteur,
                 'nbdeco': nb_decos,
-                'proprio': u" ".join([
+                'proprio': u" ".join(
                     unicode(proprio.get('prenom', [u''])[0]),
-                    unicode(proprio.get('nom', [u''])[0])
-                ]),
+                    unicode(proprio.get('nom', [u''])[0]),
+                ),
                 'ps': fichier_ps,
             }
             corps = corps.encode('utf-8')
@@ -348,18 +345,15 @@ def upload_soft(proprio, elupload, elid, eltype, curseur):
     with mail_module.ServerConnection() as smtp_connect:
         corps = mail_module.generate('upload_soft', {
             'from': upload.expediteur,
-            'to': unicode(proprio['mail'][0]),
+            'to': unicode(proprio.get_mail()),
             'upload': "%.2f" % (elupload,),
-            'proprio': u" ".join([
-                unicode(proprio.get('prenom', [u''])[0]),
-                unicode(proprio.get('nom', [u''])[0]),
-            ]),
+            'proprio': proprio,
             'lang_info':'English version below',
             'limite_soft': upload.soft,
             'limite_hard': upload.hard,
         }).as_string()
         if not DEBUG:
-            smtp_connect.sendmail(upload.expediteur, proprio.get_mail(), corps)
+            smtp_connect.sendmail(upload.expediteur, unicode(proprio.get_mail()), corps)
         else:
             print corps
 
@@ -370,10 +364,10 @@ def upload_soft(proprio, elupload, elid, eltype, curseur):
                 'from': upload.expediteur,
                 'to': upload.expediteur,
                 'upload': "%.2f" % (elupload,),
-                'proprio': u" ".join([
+                'proprio': u" ".join(
                     unicode(proprio.get('prenom', [u''])[0]),
                     unicode(proprio.get('nom', [u''])[0]),
-                ]),
+                ),
             }
             corps = corps.encode('utf-8')
             smtp_connect.sendmail(upload.expediteur, upload.expediteur, corps)