diff --git a/mayan/apps/appearance/templates/appearance/password_change_done.html b/mayan/apps/appearance/templates/appearance/password_change_done.html
deleted file mode 100644
index b6fac87e47..0000000000
--- a/mayan/apps/appearance/templates/appearance/password_change_done.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends 'appearance/base.html' %}
-
-{% load i18n %}
-
-{% block title %} :: {% trans 'Password change' %}{% endblock %}
-
-{% block content %}
-    <h2>{% trans 'Your password has been successfully changed.' %}</h2>
-{% endblock %}
diff --git a/mayan/apps/appearance/templates/appearance/password_change_form.html b/mayan/apps/appearance/templates/appearance/password_change_form.html
deleted file mode 100644
index 8a9031f7f8..0000000000
--- a/mayan/apps/appearance/templates/appearance/password_change_form.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends 'appearance/generic_form.html' %}
-
-{% load i18n %}
-
-{% block title %} :: {% trans 'Password change' %}{% endblock %}
-
-{% block form_title %}{% trans 'Password change' %}{% endblock %}
diff --git a/mayan/apps/common/views.py b/mayan/apps/common/views.py
index d430cc0cb0..70cdfd0e27 100644
--- a/mayan/apps/common/views.py
+++ b/mayan/apps/common/views.py
@@ -293,7 +293,7 @@ def password_change_view(request):
     return password_change(
         request,
         extra_context=context,
-        template_name='appearance/password_change_form.html',
+        template_name='appearance/generic_form.html',
         post_change_redirect=reverse('common:password_change_done'),
     )