diff --git a/templates/security/email/change_notice.html b/templates/security/email/change_notice.html
index 915b83c4..b394607a 100644
--- a/templates/security/email/change_notice.html
+++ b/templates/security/email/change_notice.html
@@ -8,8 +8,9 @@
             </td>
         </tr>
         <tr>
+            {% set name = user.profile.full_name if user.profile and user.profile.full_name else user.username %}
             <td style="padding:5px 15px 10px 15px;">
-                <p>{{ _('Hello, %(username)s!', username=user.username) }}</p>
+                <p>{{ _('Hello, %(name)s!', name=name) }}</p>
                 <p>{{ _('Your password has been successfully changed!') }}</p>
             </td>
         </tr>
diff --git a/templates/security/email/confirmation_instructions.html b/templates/security/email/confirmation_instructions.html
index 46aeabf5..ff4f8df2 100644
--- a/templates/security/email/confirmation_instructions.html
+++ b/templates/security/email/confirmation_instructions.html
@@ -4,12 +4,13 @@
             <td style="padding:15px 15px 10px 15px;">
                 <a href="{{ url_for('security.login', _external=True) }}">
                     <img src="{{ url_for('static', filename='images/zenodo-gradient-1000.png', _external=True) }}" style="width:250px;border-radius:10px;"/>
-                </a>               
+                </a>
             </td>
         </tr>
         <tr>
+            {% set name = user.profile.full_name if user.profile and user.profile.full_name else user.username %}
             <td style="padding:5px 15px 10px 15px;">
-                <p>{{ _('Hello, %(username)s!', username=user.username) }}</p>
+                <p>{{ _('Hello, %(name)s!', name=name) }}</p>
                 <p>{{ _('You have received this message because your email address has been registered with Zenodo.') }} </p>
                 <p>{{ _('Verify yourself and confirm your email by clicking below.') }}</p>
             </td>
diff --git a/templates/security/email/reset_instructions.html b/templates/security/email/reset_instructions.html
index 2534b579..a2cef42b 100644
--- a/templates/security/email/reset_instructions.html
+++ b/templates/security/email/reset_instructions.html
@@ -8,8 +8,9 @@
             </td>
         </tr>
         <tr>
+            {% set name = user.profile.full_name if user.profile and user.profile.full_name else user.username %}
             <td style="padding:5px 15px 10px 15px;">
-                <p>{{ _('Hello, %(username)s!', username=user.username) }}</p>
+                <p>{{ _('Hello, %(name)s!', name=name) }}</p>
                 <p>{{ _('There was a request to reset your password.') }}</p>
                 <p>{{ _('If you did not make this request then please ignore this message.') }}</p>
                 <p>{{ _('Otherwise, please press the button below to change your password.') }}</p>
diff --git a/templates/security/email/reset_notice.html b/templates/security/email/reset_notice.html
index a28ecbc8..27d40d53 100644
--- a/templates/security/email/reset_notice.html
+++ b/templates/security/email/reset_notice.html
@@ -8,8 +8,9 @@
             </td>
         </tr>
         <tr>
+            {% set name = user.profile.full_name if user.profile and user.profile.full_name else user.username %}
             <td style="padding:5px 15px 10px 15px;">
-                <p>{{ _('Hello, %(username)s!', username=user.username) }}</p>
+                <p>{{ _('Hello, %(name)s!', name=name) }}</p>
                 <p>{{ _('Your password has been successfully reset!') }}</p>
             </td>
         </tr>