diff --git a/users/templates/users/confirm_email.html b/users/templates/users/confirm_email.html
index 61ae250e..c90af524 100644
--- a/users/templates/users/confirm_email.html
+++ b/users/templates/users/confirm_email.html
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <form class="form" method="post">
     {% csrf_token %}
     <h4>{% blocktrans %}Confirmation email{% endblocktrans %}</h4>
-    <p>{% blocktrans %}Confirm the email{% endblocktrans %} <a href="mailto:{{ email }}">{{ email }}</a> {% blocktrans %}for user {{ firstname }} {{ lastname }}.{% endblocktrans %}.</p>
+    <p>{% blocktrans %}Confirm the email{% endblocktrans %} <a href="mailto:{{ email }}">{{ email }}</a> {% blocktrans %}for user {{ firstname }} {{ lastname }}.{% endblocktrans %}</p>
     {% trans "Confirm" as tr_confirm %}
     {% bootstrap_button tr_confirm button_type="submit" icon="ok" button_class="btn-success" %}
 </form>
diff --git a/users/views.py b/users/views.py
index 5b8b8e47..42dc48e2 100644
--- a/users/views.py
+++ b/users/views.py
@@ -1067,7 +1067,7 @@ def process_email(request, req):
         return redirect(reverse("index"))
 
     return form(
-        {"email": user.email, "firstname": user.firstname, "lastname": user.surname},
+        {"email": user.email, "firstname": user.name, "lastname": user.surname},
         "users/confirm_email.html",
         request
     )