diff --git a/ghost/admin/app/templates/reset.hbs b/ghost/admin/app/templates/reset.hbs
index e9a4b2b1fc..0a8733ce28 100644
--- a/ghost/admin/app/templates/reset.hbs
+++ b/ghost/admin/app/templates/reset.hbs
@@ -18,7 +18,7 @@
                 {{gh-task-button "Reset Password" task=resetPassword class="gh-btn gh-btn-blue gh-btn-block gh-btn-icon" type="submit" autoWidth="false"}}
             </form>
 
-            <p class="main-error">{{{flowErrors}}}</p>
+            <p class="main-error">{{flowErrors}}&nbsp;</p>
         </section>
     </div>
 </div>
diff --git a/ghost/admin/app/templates/setup/two.hbs b/ghost/admin/app/templates/setup/two.hbs
index e741a02f58..a3825ee84f 100644
--- a/ghost/admin/app/templates/setup/two.hbs
+++ b/ghost/admin/app/templates/setup/two.hbs
@@ -92,4 +92,4 @@
     {{/gh-task-button}}
 </form>
 
-<p class="main-error">{{{flowErrors}}}</p>
+<p class="main-error">{{flowErrors}}&nbsp;</p>
diff --git a/ghost/admin/app/templates/signin.hbs b/ghost/admin/app/templates/signin.hbs
index 14420d7874..5cdeff3460 100644
--- a/ghost/admin/app/templates/signin.hbs
+++ b/ghost/admin/app/templates/signin.hbs
@@ -50,7 +50,7 @@
                     tabindex="3"}}
             </form>
 
-            <p class="main-error">{{{if flowErrors flowErrors "&nbsp;"}}}</p>
+            <p class="main-error">{{if flowErrors flowErrors}}&nbsp;</p>
         </section>
     </div>
 </div>
diff --git a/ghost/admin/app/templates/signup.hbs b/ghost/admin/app/templates/signup.hbs
index d4855aed96..3125b4d252 100644
--- a/ghost/admin/app/templates/signup.hbs
+++ b/ghost/admin/app/templates/signup.hbs
@@ -67,7 +67,7 @@
                 class="gh-btn gh-btn-green gh-btn-lg gh-btn-block gh-btn-icon"
                 tabindex="3"}}
 
-            <p class="main-error">{{{if flowErrors flowErrors "&nbsp;"}}}</p>
+            <p class="main-error">{{if flowErrors flowErrors}}&nbsp;</p>
         </section>
     </div>
 
diff --git a/ghost/admin/tests/acceptance/setup-test.js b/ghost/admin/tests/acceptance/setup-test.js
index 9bdf7bf5f9..a764c9f5e9 100644
--- a/ghost/admin/tests/acceptance/setup-test.js
+++ b/ghost/admin/tests/acceptance/setup-test.js
@@ -226,7 +226,7 @@ describe('Acceptance: Setup', function () {
                 .to.equal(0);
             // we should show an error message
             expect(find('.main-error').text(), 'error text')
-                .to.equal('Access Denied from url: unknown.com. Please use the url configured in config.js.');
+                .to.have.string('Access Denied from url: unknown.com. Please use the url configured in config.js.');
         });
 
         it('handles validation errors in step 3', async function () {