diff --git a/Messaging/Limilab.vb b/Messaging/Limilab.vb
index 69bca208..f2aecd1e 100644
--- a/Messaging/Limilab.vb
+++ b/Messaging/Limilab.vb
@@ -329,7 +329,10 @@ Public Class Limilab
                         oSmtp.Connect(mailsmtp)
                     End If
                     Logger.Debug($"mailUser [{mailUser}]")
-                    oSmtp.UseBestLogin(mailUser, mailPW)   ' remove if not needed
+                    If mailUser <> String.Empty Then
+                        oSmtp.UseBestLogin(mailUser, mailPW)   ' remove if not needed
+                    End If
+
 
                     oSmtp.SendMessage(email)
                     Logger.Info("Message to " & oMailReceipiant & " has been send.")