diff --git a/templates/crm/leads/lead_detail.html b/templates/crm/leads/lead_detail.html
index b863465e..cfa12cff 100644
--- a/templates/crm/leads/lead_detail.html
+++ b/templates/crm/leads/lead_detail.html
@@ -243,7 +243,7 @@
                        aria-selected="false"
                        tabindex="-1"> <span class="fa-solid fa-clipboard me-2 tab-icon-color fs-8"></span>{{ _("Notes") }}</a>
                 </li>
-                <li class="nav-item text-nowrap me-2" role="presentation">
+                {% comment %} <li class="nav-item text-nowrap me-2" role="presentation">
                     <a class="nav-link"
                        id="emails-tab"
                        data-bs-toggle="tab"
@@ -251,7 +251,7 @@
                        role="tab"
                        aria-controls="tab-emails"
                        aria-selected="true"> <span class="fa-solid fa-envelope me-2 tab-icon-color fs-8"></span>{{ _("Emails") }}</a>
-                </li>
+                </li> {% endcomment %}
                 <li class="nav-item text-nowrap me-2" role="presentation">
                     <a class="nav-link"
                        id="activity-tab"
diff --git a/templates/crm/opportunities/opportunity_detail.html b/templates/crm/opportunities/opportunity_detail.html
index fe492a81..210f544c 100644
--- a/templates/crm/opportunities/opportunity_detail.html
+++ b/templates/crm/opportunities/opportunity_detail.html
@@ -512,7 +512,7 @@
                     {% comment %} <li class="nav-item text-nowrap me-2" role="presentation"><a class="nav-link" id="meeting-tab" data-bs-toggle="tab" href="#tab-meeting" role="tab" aria-controls="tab-meeting" aria-selected="true"> <span class="fa-solid fa-video me-2 tab-icon-color"></span>{{ _("Meetings") }}</a></li> {% endcomment %}
                     {% comment %} <li class="nav-item text-nowrap me-2" role="presentation"><a class="nav-link" id="task-tab" data-bs-toggle="tab" href="#tab-task" role="tab" aria-controls="tab-task" aria-selected="true"> <span class="fa-solid fa-square-check me-2 tab-icon-color"></span>Task</a></li> {% endcomment %}
                     {% comment %} <li class="nav-item text-nowrap me-2" role="presentation"><a class="nav-link" id="call-tab" data-bs-toggle="tab" href="#tab-call" role="tab" aria-controls="tab-call" aria-selected="true"> <span class="fa-solid fa-phone me-2 tab-icon-color"></span>{{ _("Calls") }}</a></li> {% endcomment %}
-                    <li class="nav-item text-nowrap me-2" role="presentation">
+                    {% comment %} <li class="nav-item text-nowrap me-2" role="presentation">
                         <a class="nav-link"
                            id="emails-tab"
                            data-bs-toggle="tab"
@@ -520,7 +520,7 @@
                            role="tab"
                            aria-controls="tab-emails"
                            aria-selected="true"> <span class="fa-solid fa-envelope me-2 tab-icon-color"></span>{{ _("Emails") }} </a>
-                    </li>
+                    </li> {% endcomment %}
                     <li class="nav-item text-nowrap me-2" role="presentation">
                         <a class="nav-link"
                            id="activity-tab"
diff --git a/templates/header.html b/templates/header.html
index ac3ba9e0..c26d5f53 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -488,7 +488,7 @@
         {% if request.user.is_authenticated %}
             <div class="navbar-logo">
                 <div class="d-flex align-items-center">
-                    {% with name_to_display=request.user.first_name|default:request.dealer.name %}
+                    {% with name_to_display=request.user.staff.first_name|default:request.dealer.name %}
                         <h6 class="text-gray-600 ms-2 d-none d-sm-block fs-8"
                             data-bs-toggle="tooltip"
                             data-bs-placement="bottom"