diff --git a/Messaging/Email.vb b/Messaging/Email.vb
index 85e3b606..194b69c6 100644
--- a/Messaging/Email.vb
+++ b/Messaging/Email.vb
@@ -294,9 +294,12 @@ Public Class Email
                     _logger.Debug("SSL = false")
                     myClient.EnableSsl = False
                 End If
-                _logger.Debug($"mailUser [{mailUser}]")
-                myClient.Credentials = New NetworkCredential(mailUser, mailPW)
-                myClient.UseDefaultCredentials = False
+                If mailUser <> String.Empty Then
+                    _logger.Debug($"mailUser [{mailUser}]")
+                    myClient.Credentials = New NetworkCredential(mailUser, mailPW)
+                    myClient.UseDefaultCredentials = False
+                End If
+
 
                 If Test = True Then
                     myMesssage.Body = $"This is the body (text will be replaced within profile)! <br> mailsmtp: {mailsmtp} <br> mailport: {mailport} <br> mailUser: {mailUser} <br> mailPW: XXXX <br> AUTH_TYPE: {AUTH_TYPE}"
diff --git a/Messaging/Email2.vb b/Messaging/Email2.vb
index 6575d591..40072604 100644
--- a/Messaging/Email2.vb
+++ b/Messaging/Email2.vb
@@ -69,9 +69,10 @@ Public Class Email2
                 pSMTP.StartTLS()
             End If
             Logger.Debug("Connection to SMTP Server [{0}] established!", pServer)
-
-            Logger.Debug("Logging in with user [{0}]", pUsername)
-            pSMTP.UseBestLogin(pUsername, pPassword)
+            If pUsername <> String.Empty Then
+                Logger.Debug("Logging in with user [{0}]", pUsername)
+                pSMTP.UseBestLogin(pUsername, pPassword)
+            End If
 
             Return pSMTP
 
diff --git a/Messaging/MailSender.vb b/Messaging/MailSender.vb
index 3181d127..dab059c1 100644
--- a/Messaging/MailSender.vb
+++ b/Messaging/MailSender.vb
@@ -14,6 +14,7 @@ Public Class MailSender
     Private AuthType As String
 
     Private Session As Smtp = Nothing
+    Public Connected2Server As Boolean = False
 
     Const SMTP_IGNORED_ERRORS As SslPolicyErrors =
         SslPolicyErrors.RemoteCertificateChainErrors Or ' self-signed
@@ -39,7 +40,7 @@ Public Class MailSender
         Password = pPassword
         AuthType = pAuthType
 
-        Logger.Info("Connecting to Server..")
+        Logger.Debug("Connecting to Server..")
         Logger.Debug("SMTP Server: [{0}]", Server)
         Logger.Debug("SMTP Port: [{0}]", Port)
         Logger.Debug("SMTP User: [{0}]", User)
@@ -108,9 +109,10 @@ Public Class MailSender
         End If
 
         Try
-            Logger.Info("Logging in with user [{0}]", pUser)
-            oSession.UseBestLogin(pUser, pPassword)
-
+            If pUser <> String.Empty Then
+                Logger.Info("Logging in with user [{0}]", pUser)
+                oSession.UseBestLogin(pUser, pPassword)
+            End If
         Catch ex As Exception
             Logger.Warn("Error while connecting with Auth type PLAINTEXT!")
             Logger.Error(ex)
@@ -119,7 +121,7 @@ Public Class MailSender
         End Try
 
         Session = oSession
-
+        Connected2Server = True
         Return True
     End Function
 
@@ -175,6 +177,10 @@ Public Class MailSender
 
     Private Function SendMailTo(pSession As Smtp, pSendTo As String, pSendFrom As String, pSubject As String, pBody As String, pCreationTime As Date, pAttachments As List(Of String), pTest As Boolean)
         Try
+            If IsNothing(pSession) Then
+                Logger.Info("ATTENTION-ERROR: pSession is nothing!")
+                Return False
+            End If
             Logger.Debug("Preparing to send mail to [{0}]", pSendTo)
 
             Dim oMailBuilder As New Limilabs.Mail.MailBuilder()
@@ -189,6 +195,10 @@ Public Class MailSender
             oMailBuilder = AddAttachments(oMailBuilder, pAttachments)
 
             Logger.Debug("Now sending mail..")
+            If IsNothing(oMailBuilder) Then
+                Logger.Info("ATTENTION-ERROR: oMailBuilder is nothing!")
+                Return False
+            End If
             Dim oMail = oMailBuilder.Create()
             pSession.SendMessage(oMail)
             Logger.Info("Mail to [{0}] has been sent.", pSendTo)