diff --git a/public/de-AT/password_reset.html b/public/de-AT/password_reset.html
index 73cb1e3d52..b9705d37e4 100644
--- a/public/de-AT/password_reset.html
+++ b/public/de-AT/password_reset.html
@@ -20,7 +20,7 @@
   <h1>{{appName}}</h1>
   <h1>Reset Your Password</h1>
   <noscript><p>We apologize, but resetting your password requires javascript</p></noscript>
-  <p>You can set a new Password for your account: {{username}}</p>
+  <p>You can set a new Password{{#username}} for your account: {{username}}{{/username}}</p>
   <br />
   <p>{{error}}</p>  
   <form id='form' action='{{publicServerUrl}}/apps/{{appId}}/request_password_reset' method='POST'>
diff --git a/public/de/password_reset.html b/public/de/password_reset.html
index 73cb1e3d52..b9705d37e4 100644
--- a/public/de/password_reset.html
+++ b/public/de/password_reset.html
@@ -20,7 +20,7 @@
   <h1>{{appName}}</h1>
   <h1>Reset Your Password</h1>
   <noscript><p>We apologize, but resetting your password requires javascript</p></noscript>
-  <p>You can set a new Password for your account: {{username}}</p>
+  <p>You can set a new Password{{#username}} for your account: {{username}}{{/username}}</p>
   <br />
   <p>{{error}}</p>  
   <form id='form' action='{{publicServerUrl}}/apps/{{appId}}/request_password_reset' method='POST'>
diff --git a/public/password_reset.html b/public/password_reset.html
index 73cb1e3d52..b9705d37e4 100644
--- a/public/password_reset.html
+++ b/public/password_reset.html
@@ -20,7 +20,7 @@
   <h1>{{appName}}</h1>
   <h1>Reset Your Password</h1>
   <noscript><p>We apologize, but resetting your password requires javascript</p></noscript>
-  <p>You can set a new Password for your account: {{username}}</p>
+  <p>You can set a new Password{{#username}} for your account: {{username}}{{/username}}</p>
   <br />
   <p>{{error}}</p>  
   <form id='form' action='{{publicServerUrl}}/apps/{{appId}}/request_password_reset' method='POST'>
diff --git a/spec/PagesRouter.spec.js b/spec/PagesRouter.spec.js
index 68dfb0b17b..948212fa71 100644
--- a/spec/PagesRouter.spec.js
+++ b/spec/PagesRouter.spec.js
@@ -309,6 +309,24 @@ describe('Pages Router', () => {
         expect(replacedContent.text).not.toContain('{{error}}');
       });
 
+      it('omits the username clause on the password reset page when no username is set', async () => {
+        await expectAsync(router.goToPage(req, pages.passwordReset)).toBeResolved();
+
+        const replacedContent = await pageResponse.calls.all()[0].returnValue;
+        expect(replacedContent.text).not.toContain('for your account:');
+        expect(replacedContent.text).not.toContain('undefined');
+      });
+
+      it('shows the username on the password reset page when a username is set', async () => {
+        req.params = { appId: config.appId };
+        req.query.username = 'exampleUsername';
+
+        await expectAsync(router.passwordReset(req)).toBeResolved();
+
+        const replacedContent = await pageResponse.calls.all()[0].returnValue;
+        expect(replacedContent.text).toContain('for your account: exampleUsername');
+      });
+
       it('fills placeholders from config object', async () => {
         config.pages.enableLocalization = false;
         config.pages.placeholders = {