diff --git a/client/src/send-configurations/helpers.js b/client/src/send-configurations/helpers.js
index bf9ae9d1..f134d906 100644
--- a/client/src/send-configurations/helpers.js
+++ b/client/src/send-configurations/helpers.js
@@ -173,7 +173,7 @@ export function getMailerTypes(t) {
                     { owner.getFormValue('smtpUseAuth') &&
                     <div>
                         <InputField id="smtpUser" label={t('username')} placeholder={t('usernameEgMyaccount@examplecom')}/>
-                        <InputField id="smtpPassword" label={t('password')} placeholder={t('usernameEgMyaccount@examplecom')}/>
+                        <InputField id="smtpPassword" type="password" label={t('password')} placeholder={t('usernameEgMyaccount@examplecom')}/>
                     </div>
                     }
                 </Fieldset>
@@ -221,7 +221,7 @@ export function getMailerTypes(t) {
                                 { owner.getFormValue('smtpUseAuth') &&
                                 <div>
                                     <InputField id="smtpUser" label={t('username')} placeholder={t('usernameEgMyaccount@examplecom')}/>
-                                    <InputField id="smtpPassword" label={t('password')} placeholder={t('usernameEgMyaccount@examplecom')}/>
+                                    <InputField id="smtpPassword" type="password" label={t('password')} placeholder={t('usernameEgMyaccount@examplecom')}/>
                                 </div>
                                 }
                             </div>
diff --git a/locales/en-US/common.json b/locales/en-US/common.json
index 95222dc3..0a5e757a 100644
--- a/locales/en-US/common.json
+++ b/locales/en-US/common.json
@@ -728,7 +728,7 @@
   "subject": "Subject",
   "xMailer": "X-Mailer",
   "verpBounceHandling": "VERP Bounce Handling",
-  "verpEnabled": "verpEnabled",
+  "verpEnabled": "VERP Enabled",
   "serverHostname": "Server hostname",
   "theVerpServerHostnameEgBouncesexamplecom": "The VERP server hostname, eg. bounces.example.com",
   "verpBounceHandlingServerHostnameThis": "VERP bounce handling server hostname. This hostname is used in the SMTP envelope FROM address and the MX DNS records should point to this server",
diff --git a/server/config/default.yaml b/server/config/default.yaml
index c454447c..ec23a74b 100644
--- a/server/config/default.yaml
+++ b/server/config/default.yaml
@@ -121,7 +121,7 @@ verp:
   # In most cases you do not want to use it
   # Requires root privileges
   enabled: false
-  port: 2525
+  port: 25
   host: 0.0.0.0
   # With DMARC, the Return-Path and From address must match the same domain.
   # By default we get around this by using the VERP address in the Sender header,