diff --git a/application/views/emails/new_password.php b/application/views/emails/new_password.php
index 8ae7ee69..0532bbb2 100644
--- a/application/views/emails/new_password.php
+++ b/application/views/emails/new_password.php
@@ -1,6 +1,6 @@
 <html lang="en">
 <head>
-    <title>New Account Password</title>
+    <title>New Password | Easy!Appointments</title>
 </head>
 <body style="font: 13px arial, helvetica, tahoma;">
     <div class="email-container" style="width: 650px; border: 1px solid #eee;">
@@ -8,12 +8,13 @@
                 height: 45px; padding: 10px 15px;">
             <strong id="logo" style="color: white; font-size: 20px;
                     text-shadow: 1px 1px 1px #8F8888; margin-top: 10px; display: inline-block">
-                    $company_name</strong>
+                    <?= $company_name ?>
+            </strong>
         </div>
 
         <div id="content" style="padding: 10px 15px;">
-            <h2>$email_title</h2>
-            <p>$email_message</p>
+            <h2><?= $email_title ?></h2>
+            <p><?= $email_message ?></p>
         </div>
 
         <div id="footer" style="padding: 10px; text-align: center; margin-top: 10px;
@@ -21,7 +22,7 @@
             Powered by
             <a href="https://easyappointments.org" style="text-decoration: none;">Easy!Appointments</a>
             |
-            <a href="$company_link" style="text-decoration: none;">$company_name</a>
+            <a href="<?= $company_link ?>" style="text-decoration: none;"><?= $company_name ?></a>
         </div>
     </div>
 </body>
diff --git a/engine/Notifications/Email.php b/engine/Notifications/Email.php
index 4e0bddc4..0f461d12 100755
--- a/engine/Notifications/Email.php
+++ b/engine/Notifications/Email.php
@@ -255,11 +255,11 @@ class Email {
     public function sendPassword(NonEmptyText $password, EmailAddress $recipientEmail, array $company)
     {
         $email_title = $this->framework->lang->line('new_account_password');
-        $email_message = $this->framework->lang->line('new_password_is');
+        $password = '<strong>' . $password->get() . '</strong>';
+        $email_message = str_replace('$password', $password, $this->framework->lang->line('new_password_is'));
         $company_name = $company['company_name'];
         $company_email = $company['company_email'];
         $company_link = $company['company_link'];
-        $password = '<strong>' . $password->get() . '</strong>';
 
         ob_start();
         require __DIR__ . '/../../application/views/emails/new_password.php';
