diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d36dbc7e0f..369bad45aa 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -45,6 +45,7 @@ Changelog
  * Fix: Make icon font implementation more screen-reader-friendly (Thibaud Colas)
  * Fix: Remove duplicate labels in image gallery and image choosers for screen reader users (Helen Chapman)
  * Fix: Restore custom "Date" icon for scheduled publishing panel in Edit page’s Settings tab (Helen Chapman)
+ * Fix: Added missing form media to user edit form template (Matt Westcott)
 
 
 2.5.1 (07.05.2019)
diff --git a/docs/releases/2.6.rst b/docs/releases/2.6.rst
index 37b7e36d40..44cd48aa9b 100644
--- a/docs/releases/2.6.rst
+++ b/docs/releases/2.6.rst
@@ -59,6 +59,7 @@ Bug fixes
  * Make icon font implementation more screen-reader-friendly (Thibaud Colas)
  * Remove duplicate labels in image gallery and image choosers for screen reader users (Helen Chapman)
  * Restore custom "Date" icon for scheduled publishing panel in Edit page’s Settings tab (Helen Chapman)
+ * Added missing form media to user edit form template (Matt Westcott)
 
 
 Upgrade considerations
diff --git a/wagtail/users/templates/wagtailusers/users/edit.html b/wagtail/users/templates/wagtailusers/users/edit.html
index 1b52c78364..ec74053c60 100644
--- a/wagtail/users/templates/wagtailusers/users/edit.html
+++ b/wagtail/users/templates/wagtailusers/users/edit.html
@@ -67,8 +67,10 @@
 {% block extra_css %}
     {{ block.super }}
     {% include "wagtailadmin/pages/_editor_css.html" %}
+    {{ form.media.css }}
 {% endblock %}
 {% block extra_js %}
     {{ block.super }}
     {% include "wagtailadmin/pages/_editor_js.html" %}
+    {{ form.media.js }}
 {% endblock %}