From 67631117e5375bc96e638ae02b7d9184e1474c29 Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Sun, 1 Mar 2015 20:22:59 +0100
Subject: [PATCH] Fix link in mail when user with similar name already exists

---
 jm2l/views.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jm2l/views.py b/jm2l/views.py
index f6bae52..28d34b7 100644
--- a/jm2l/views.py
+++ b/jm2l/views.py
@@ -653,14 +653,15 @@ def participer(request):
             CheckExist=None
         if CheckExist:
             MyLink = CheckExist.my_hash
+            NewUser = CheckExist
         else:
             DBSession.add(TmpUsr)
             DBSession.flush()
             MyLink = TmpUsr.my_hash
+            NewUser = TmpUsr
 
-        mailer = request.registry['mailer']
         # Send the Welcome Mail
-        NewUser = TmpUsr
+        mailer = request.registry['mailer']
         # Prepare Plain Text Message :
         Mail_template = Template(filename='jm2l/templates/mail_plain.mako')
         mail_plain = Mail_template.render(request=request, User=NewUser, action="Welcome")