diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 43497ba529..53dbbaa410 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -42,6 +42,7 @@ Changelog
  * Fix: Inconsistent order of heading features when adding h1, h5 or h6 as default feature for Hallo RichText editor (Loic Teixeira)
  * Fix: Add invalid password reset link error message (Coen van der Kamp)
  * Fix: Bypass select/prefetch related optimisation on `update_index` for `ParentalManyToManyField` to fix crash (Tim Kamanin)
+ * Fix: 'Add user' is now rendered as a button due to the use of quotes within translations (Benoît Vogel)
 
 
 2.0.1 (04.04.2018)
diff --git a/docs/releases/2.1.rst b/docs/releases/2.1.rst
index 4f17a1c5b7..48fb94078d 100644
--- a/docs/releases/2.1.rst
+++ b/docs/releases/2.1.rst
@@ -60,6 +60,7 @@ Bug fixes
  * Inconsistent order of heading features when adding h1, h5 or h6 as default feature for Hallo RichText editor (Loic Teixeira)
  * Add invalid password reset link error message (Coen van der Kamp)
  * Bypass select/prefetch related optimisation on ``update_index`` for ``ParentalManyToManyField`` to fix crash (Tim Kamanin)
+ * 'Add user' is now rendered as a button due to the use of quotes within translations (Benoît Vogel)
 
 
 Upgrade considerations
diff --git a/wagtail/users/templates/wagtailusers/users/create.html b/wagtail/users/templates/wagtailusers/users/create.html
index ba64b3ace9..75452905a6 100644
--- a/wagtail/users/templates/wagtailusers/users/create.html
+++ b/wagtail/users/templates/wagtailusers/users/create.html
@@ -40,7 +40,7 @@
                 <ul class="fields">
                     {% include "wagtailadmin/shared/field_as_li.html" with field=form.is_superuser %}
                     {% include "wagtailadmin/shared/field_as_li.html" with field=form.groups %}
-                    <li><input type="submit" value='{% trans "Add user" %}' class="button" /></li>
+                    <li><button class="button">{% trans "Add user" %}</button></li>
                 </ul>
             </section>
         </div>