diff --git a/ccm-core/src/com/arsdigita/mail/Mail.java b/ccm-core/src/com/arsdigita/mail/Mail.java
index 9a1d68440..f6e4ff8a0 100755
--- a/ccm-core/src/com/arsdigita/mail/Mail.java
+++ b/ccm-core/src/com/arsdigita/mail/Mail.java
@@ -264,6 +264,13 @@ public class Mail implements MessageType {
         throws MessagingException,
                SendFailedException {
         Transport transport = getSession().getTransport();
+        Properties properties = getConfig().getJavamail();
+        if ("true".equals(properties.getProperty("mail.smtp.auth"))) {
+            transport.connect(properties.getProperty("mail.smtp.user"),
+                              properties.getProperty("mail.smtp.password"));
+        } else {
+            transport.connect();
+        }
         transport.connect();
         send(transport);
         transport.close();