diff --git a/application/app/templates/registration/login.html b/application/app/templates/registration/login.html
index c0179b4..14dc819 100644
--- a/application/app/templates/registration/login.html
+++ b/application/app/templates/registration/login.html
@@ -71,12 +71,12 @@
                         
                     {% if user_.first_name %}
 
-                        {{ user_.first_name }}
-
                         {% if user_.last_name %}
-                            {{ user_.last_name }}
+                            {{ user_.last_name }},
                         {% endif %}
 
+                        {{ user_.first_name }}
+
                     {% else %}
                         {{ user_.username }}
                     {% endif %}