Index: src/main/groovy/com/lemans/pricecalc/dumbster/Dumbster.groovy
===================================================================
diff -u -r32f3b4d8c8c5b6774d0cefabe0b0747cdace9399 -rbc2beaff38acc02204fe9542eb79cb5a4cb471c3
--- src/main/groovy/com/lemans/pricecalc/dumbster/Dumbster.groovy	(.../Dumbster.groovy)	(revision 32f3b4d8c8c5b6774d0cefabe0b0747cdace9399)
+++ src/main/groovy/com/lemans/pricecalc/dumbster/Dumbster.groovy	(.../Dumbster.groovy)	(revision bc2beaff38acc02204fe9542eb79cb5a4cb471c3)
@@ -25,7 +25,7 @@
 	 */
 	@SuppressWarnings('Println')
 	void start() {
-		port = 1025
+		port = 587
 		while (true) {
 			try {
 				new ServerSocket(port).close()
Index: src/main/groovy/com/lemans/pricecalc/services/helper/EmailService.groovy
===================================================================
diff -u -re75d53060ecf69093ee7c9255cd2c3298701dd1c -rbc2beaff38acc02204fe9542eb79cb5a4cb471c3
--- src/main/groovy/com/lemans/pricecalc/services/helper/EmailService.groovy	(.../EmailService.groovy)	(revision e75d53060ecf69093ee7c9255cd2c3298701dd1c)
+++ src/main/groovy/com/lemans/pricecalc/services/helper/EmailService.groovy	(.../EmailService.groovy)	(revision bc2beaff38acc02204fe9542eb79cb5a4cb471c3)
@@ -6,22 +6,21 @@
 import groovy.text.markup.MarkupTemplateEngine
 import groovy.text.markup.TemplateConfiguration
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.mail.MailSender
+import org.springframework.mail.javamail.JavaMailSenderImpl
 import org.springframework.stereotype.Service
-
 import javax.mail.internet.InternetAddress
 import javax.mail.internet.MimeMessage
 
 @Service
 class EmailService extends LemansService {
 
     @Autowired
-    MailSender mailSender
+    JavaMailSenderImpl javaMailSender
 
     @Autowired
     String emailSubPrefix
 
-    static final String NO_REPLY_FROM = 'HelpDesk<noreply@parts-unltd.com>'
+    static final String NO_REPLY_FROM = 'HelpDesk<calcpro@parts-unltd.com>'
 
     private static final String PENDING_BUYER_REVIEWS = '''SELECT 
     partNumber 
@@ -115,13 +114,12 @@
         Template template = engine.createTemplate(tmpl)
         Writable output = template.make(body)
         output.writeTo(writer)
-
-        MimeMessage mimeMessage = mailSender.createMimeMessage()
+        MimeMessage mimeMessage = javaMailSender.createMimeMessage()
         body.to.each { mimeMessage.addRecipient(MimeMessage.RecipientType.TO, new InternetAddress(it)) }
         mimeMessage.from = new InternetAddress(NO_REPLY_FROM)
         mimeMessage.subject = body.subject
         mimeMessage.setContent writer.toString(), 'text/html'
-        mailSender.send(mimeMessage)
+        javaMailSender.send(mimeMessage)
     }
 
     private String getEmailTemplate(String viewName) {
Index: src/main/resources/resources.groovy
===================================================================
diff -u -r43a6c0301aeebd5bc01b49c7c553ae512e110c09 -rbc2beaff38acc02204fe9542eb79cb5a4cb471c3
--- src/main/resources/resources.groovy	(.../resources.groovy)	(revision 43a6c0301aeebd5bc01b49c7c553ae512e110c09)
+++ src/main/resources/resources.groovy	(.../resources.groovy)	(revision bc2beaff38acc02204fe9542eb79cb5a4cb471c3)
@@ -23,7 +23,15 @@
         mfFileDropLocation(org.springframework.jndi.JndiObjectFactoryBean) {
             jndiName = 'java:comp/env/mfFileDropLocation'
         }
-        emailHost(String, 'smtp.lemanscorp.com')
+
+        emailHost(String, 'smtp.office365.com')
+        emailUserName(String, 'calcpro@parts-unltd.com')
+        //calcProMailSecurity(String, 'VNb^tE1x05ui1HekyQdh')
+
+        calcProMailSecurity(org.springframework.jndi.JndiObjectFactoryBean) {
+            jndiName = 'java:comp/env/calcProMailSecurity'
+        }
+
         emailToggle(org.springframework.jndi.JndiObjectFactoryBean) {
             jndiName = 'java:comp/env/emailToggle'
         }
@@ -42,6 +50,9 @@
         temporaryDocumentPath(org.springframework.jndi.JndiObjectFactoryBean) {
             jndiName = 'java:comp/env/temporaryDocumentPath'
         }
+        calcProMailSecurity(org.springframework.jndi.JndiObjectFactoryBean) {
+            jndiName = 'java:comp/env/calcProMailSecurity'
+        }
     } else {
         authServiceContext(String, 'http://services3.dev.lemanscorp.com/auth-service/verifyRequest')
         widenCalcApi(String, 'https://edge-alpha.stage.yden.us/api/calcs')
@@ -64,8 +75,22 @@
     }
     httpClient(DefaultHttpClient, httpConnectionManager)
 
-    mailSender(JavaMailSenderImpl) {
-        host = ref('emailHost')
+    if (Env.getCurrent() == Env.PRODUCTION) {
+        mailSender(JavaMailSenderImpl) {
+            host = ref('emailHost')
+            port = 587
+            username = ref('emailUserName')
+            password = ref('calcProMailSecurity')
+            javaMailProperties = [
+                    'mail.smtp.auth'     : 'true',
+                    'mail.smtp.starttls.enable': 'true',
+                    'mail.smtp.ssl.protocols': 'TLSv1.2 TLSv1.3'
+            ]
+        }
+    } else {
+        mailSender(JavaMailSenderImpl) {
+            host = ref('emailHost')
+        }
     }
 
     if (Env.getCurrent() != Env.PRODUCTION) {