diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 43f77d0f04aad8086c157e5a9fa9002f0481edeb..25d30de5a7e0f93430b022d5e7bbe1235838077a 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -194,6 +194,27 @@ begin
   if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\NLTechno\DoliWamp','smtpServer', value) then
   begin
       if value <> '' then smtpServer:=value;
+  end
+  else
+  begin
+    if RegQueryStringValue(HKEY_CURRENT_USER, 'Software\Microsoft\Internet Account Manager\Accounts\00000001','SMTP Server', value) then
+    begin
+      if value <> '' then smtpServer:=value;
+    end
+    else
+    begin
+      if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'PMail\ServiceInfo\Mail_Account_1','SvcSMTPHost', value) then
+      begin
+        if value <> '' then smtpServer:=value;
+      end
+      else
+      begin
+        if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\MSCRM','SMTPServer', value) then
+        begin
+          if value <> '' then smtpServer:=value;
+        end
+      end
+    end
   end;
 
   if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\NLTechno\DoliWamp','apachePort', value) then