diff --git a/admin/smtp_servers.pl b/admin/smtp_servers.pl
index f5d7b083e5..da2acee874 100755
--- a/admin/smtp_servers.pl
+++ b/admin/smtp_servers.pl
@@ -138,6 +138,7 @@ elsif ( $op eq 'edit_save' ) {
                     timeout   => $timeout,
                     ssl_mode  => $ssl_mode,
                     user_name => $user_name,
+                    password  => $password,
                     debug     => $debug
                 }
             )->store;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
index 4b6dfc9661..ce3e58d2a6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
@@ -172,7 +172,11 @@ SMTP servers
                 </li>
                 <li>
                     <label for="smtp_password">Password: </label>
-                    <input type="password" name="smtp_password" id="smtp_password" size="60"  value="****"/>
+                    [% IF smtp_server.password %]
+                        <input type="password" name="smtp_password" id="smtp_password" size="60"  value="****"/>
+                    [% ELSE %]
+                        <input type="password" name="smtp_password" id="smtp_password" size="60"  value=""/>
+                    [% END %]
                 </li>
                 <li>
                     <label for="smtp_debug_mode">Debug mode: </label>