diff --git a/web/ASC.Web.Api/Api/SmtpSettingsController.cs b/web/ASC.Web.Api/Api/SmtpSettingsController.cs
index 32ae5da377..6bbd747163 100644
--- a/web/ASC.Web.Api/Api/SmtpSettingsController.cs
+++ b/web/ASC.Web.Api/Api/SmtpSettingsController.cs
@@ -81,7 +81,7 @@ public class SmtpSettingsController : ControllerBase
 
         _permissionContext.DemandPermissions(SecutiryConstants.EditPortalSettings);
 
-        var settingConfig = _mapper.Map<SmtpSettingsDto, SmtpSettings>(inDto);
+        var settingConfig = ToSmtpSettingsConfig(inDto);
 
         _coreConfiguration.SmtpSettings = settingConfig;
 
@@ -91,6 +91,26 @@ public class SmtpSettingsController : ControllerBase
         return settings;
     }
 
+    private SmtpSettings ToSmtpSettingsConfig(SmtpSettingsDto inDto)
+    {
+        var settingsConfig = new SmtpSettings(
+            inDto.Host,
+            inDto.Port ?? SmtpSettings.DefaultSmtpPort,
+            inDto.SenderAddress,
+            inDto.SenderDisplayName)
+        {
+            EnableSSL = inDto.EnableSSL,
+            EnableAuth = inDto.EnableAuth
+        };
+
+        if (inDto.EnableAuth)
+        {
+            settingsConfig.SetCredentials(inDto.CredentialsUserName, inDto.CredentialsUserPassword);
+        }
+
+        return settingsConfig;
+    }
+
     [HttpDelete("smtp")]
     public SmtpSettingsDto ResetSmtpSettings()
     {
diff --git a/web/ASC.Web.Api/Core/SmtpJob.cs b/web/ASC.Web.Api/Core/SmtpJob.cs
index 9b95b66f51..aa0c520ece 100644
--- a/web/ASC.Web.Api/Core/SmtpJob.cs
+++ b/web/ASC.Web.Api/Core/SmtpJob.cs
@@ -143,6 +143,8 @@ public class SmtpJob : DistributedTaskProgress
             PublishChanges();
 
             client.Send(FormatOptions.Default, mimeMessage);
+
+            Percentage = 100;
         }
         catch (AuthorizingException authError)
         {