Index: grails-app/conf/spring/resources.groovy
===================================================================
diff -u -r75c1874d6dd0213527d1449d619d18ef22f15263 -r6cb89efb85d7a02c739657f74b4754d4bb8f42f6
--- grails-app/conf/spring/resources.groovy	(.../resources.groovy)	(revision 75c1874d6dd0213527d1449d619d18ef22f15263)
+++ grails-app/conf/spring/resources.groovy	(.../resources.groovy)	(revision 6cb89efb85d7a02c739657f74b4754d4bb8f42f6)
@@ -13,6 +13,9 @@
 		authServiceContext(String, 'http://services1.dev.lemanscorp.com/auth-service/verifyRequest')
 		correspondenceEmailDomain(String, 'test.com')
 		emailHost(String, 'localhost')
+		mailSender(JavaMailSenderImpl) {
+			host = ref('emailHost')
+		}
 	}
 	else {
 		authServiceContext(org.springframework.jndi.JndiObjectFactoryBean) {
@@ -24,6 +27,23 @@
 		emailHost(org.springframework.jndi.JndiObjectFactoryBean) {
 			jndiName = 'java:comp/env/emailHost'
 		}
+		servicesMailSecurityUsername(org.springframework.jndi.JndiObjectFactoryBean) {
+			jndiName = 'java:comp/env/servicesMailSecurityUsername'
+		}
+		servicesMailSecurityPassword(org.springframework.jndi.JndiObjectFactoryBean) {
+			jndiName = 'java:comp/env/servicesMailSecurityPassword'
+		}
+		mailSender(JavaMailSenderImpl) {
+			host = ref('emailHost')
+			port = 587
+			username = ref('servicesMailSecurityUsername')
+			password = ref('servicesMailSecurityPassword')
+			javaMailProperties = [
+					'mail.smtp.auth'     : 'true',
+					'mail.smtp.starttls.enable': 'true',
+					'mail.smtp.ssl.protocols': 'TLSv1.2 TLSv1.3'
+			]
+		}
 	}
 
 	mailSender(JavaMailSenderImpl) {
Index: src/main/groovy/grails/plugin/dumbster/Dumbster.groovy
===================================================================
diff -u -r75c1874d6dd0213527d1449d619d18ef22f15263 -r6cb89efb85d7a02c739657f74b4754d4bb8f42f6
--- src/main/groovy/grails/plugin/dumbster/Dumbster.groovy	(.../Dumbster.groovy)	(revision 75c1874d6dd0213527d1449d619d18ef22f15263)
+++ src/main/groovy/grails/plugin/dumbster/Dumbster.groovy	(.../Dumbster.groovy)	(revision 6cb89efb85d7a02c739657f74b4754d4bb8f42f6)
@@ -28,7 +28,7 @@
 			port = conf.port
 		}
 		else {
-			port = 1025
+			port = 587
 			while (true) {
 				try {
 					new ServerSocket(port).close()