diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html
index 4e632b015..134ba4dcb 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html
@@ -22,12 +22,11 @@
         {% else %}
           {% raw %}{{ object.username }}{% endraw %}
         {% endif %}
-        {% raw %}
       </h2>
-      {% if object.name %}<p>{{ object.name }}</p>{% endif %}
+      {% if cookiecutter.username_type == "username" %}{% raw %}{% if object.name %}<p>{{ object.name }}</p>{% endif %}{% endraw %}{% endif %}
     </div>
   </div>
-  {% if object == request.user %}
+  {% raw %}{% if object == request.user %}
     <!-- Action buttons -->
     <div class="row">
       <div class="col-sm-12">