diff --git a/scala/src/org/broadinstitute/sting/queue/util/EmailMessage.scala b/scala/src/org/broadinstitute/sting/queue/util/EmailMessage.scala
index 96430b824..12231c873 100644
--- a/scala/src/org/broadinstitute/sting/queue/util/EmailMessage.scala
+++ b/scala/src/org/broadinstitute/sting/queue/util/EmailMessage.scala
@@ -32,7 +32,7 @@ class EmailMessage extends Logging {
       email.setSslSmtpPort(settings.port.toString)
     }
 
-    if (settings.username != null && settings.password != null && settings.passwordFile != null) {
+    if (settings.username != null && (settings.password != null || settings.passwordFile != null)) {
       val password = {
         if (settings.passwordFile != null) {
           val reader = new FileReader(settings.passwordFile)