diff --git a/templates/email/ChangePasswordEmail.ss b/templates/email/ChangePasswordEmail.ss
index ada6b4a91..47c044ff9 100644
--- a/templates/email/ChangePasswordEmail.ss
+++ b/templates/email/ChangePasswordEmail.ss
@@ -6,6 +6,6 @@
 </p>
 
 <p>
-	<%t ChangePasswordEmail_ss.EMAIL 'Email' %>: $Email<br />
-	<%t ChangePasswordEmail_ss.PASSWORD 'Password' %>: $CleartextPassword
+	<%t ChangePasswordEmail_ss.EMAIL 'Email' %>: $Email<% if $CleartextPassword %><br />
+	<%t ChangePasswordEmail_ss.PASSWORD 'Password' %>: $CleartextPassword<% end_if %>
 </p>