diff --git a/CHANGELOG b/CHANGELOG
index 1ad27c5e1..c45af0c94 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,7 @@ CHANGELOG Roundcube Webmail
 - Templates: Add support for nested if conditions (#6818)
 - Templates: Make [space][slash] ending of condition objects optional (#6954)
 - Fix so messages in threads with no root aren't displayed separately (#4999)
+- Installer: Fix regression in SMTP test section (#7417)
 
 RELEASE 1.4.5
 -------------
diff --git a/installer/test.php b/installer/test.php
index 9e28afb03..264e0b0d6 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -279,10 +279,16 @@ if ($user == '%u') {
     $user_field = new html_inputfield(array('name' => '_smtp_user', 'id' => 'smtp_user'));
     $user = $user_field->show($_POST['_smtp_user']);
 }
+else {
+    $user = html::quote($user);
+}
 if ($pass == '%p') {
     $pass_field = new html_passwordfield(array('name' => '_smtp_pass', 'id' => 'smtp_pass'));
     $pass = $pass_field->show();
 }
+else {
+    $pass = html::quote($pass);
+}
 
 ?>
 
@@ -301,11 +307,11 @@ if ($pass == '%p') {
   </tr>
   <tr>
     <td><label for="smtp_user">Username</label></td>
-    <td><?php echo rcube::Q($user); ?></td>
+    <td><?php echo $user; ?></td>
   </tr>
   <tr>
     <td><label for="smtp_pass">Password</label></td>
-    <td><?php echo rcube::Q($pass); ?></td>
+    <td><?php echo $pass; ?></td>
   </tr>
 </tbody>
 </table>