diff --git a/zapisy/apps/users/templates/users/my_profile.html b/zapisy/apps/users/templates/users/my_profile.html
index 3dd98dfdf4..d9ba5fca13 100644
--- a/zapisy/apps/users/templates/users/my_profile.html
+++ b/zapisy/apps/users/templates/users/my_profile.html
@@ -63,7 +63,12 @@ <h2>Moje dane</h2>
         </table>
 
         <a class="btn btn-light" href="{% url 'password_change' %}" role="button">Zmień hasło</a>
-        {% if not user.student %}
+        <!--
+        A phd student is defined as a user who is both a student and an employee.
+        The "external_contractors" group represents people who are not regular employees or students.
+        Note: There are other user groups in the system that are not yet considered in the condition below.
+        -->
+        {% if user.employee or is_external_contractor or not user.student %}
             <a class="btn btn-light" href="{% url 'email-change' %}" role="button">Zmień adres email</a>
         {% endif %}
         {% if user.employee %}
diff --git a/zapisy/apps/users/views.py b/zapisy/apps/users/views.py
index a7f5753148..70253f60db 100644
--- a/zapisy/apps/users/views.py
+++ b/zapisy/apps/users/views.py
@@ -16,7 +16,7 @@
 from apps.users.decorators import employee_required, external_contractor_forbidden
 
 from .forms import EmailChangeForm, EmployeeDataForm
-from .models import Employee, PersonalDataConsent, Student
+from .models import Employee, PersonalDataConsent, Student, is_external_contractor
 
 logger = logging.getLogger()
 
@@ -159,9 +159,11 @@ def my_profile(request):
     consultations).
     """
     semester = Semester.get_upcoming_semester()
+    is_ext_contractor = is_external_contractor(request.user)
 
     data = {
         'semester': semester,
+        'is_external_contractor': is_ext_contractor,
     }
 
     if request.user.employee: