3 files changed, 7 insertions, 7 deletions
diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDav.cs b/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDav.cs
index dcead5c..990f338 100644
--- a/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDav.cs
+++ b/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDav.cs
@@ -6,7 +6,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http
 {
     internal class WebDav : HttpValidation<WebDavOptions, WebDav>
     {
-        private WebDavClientWrapper _webdavClient;
+        private readonly WebDavClientWrapper _webdavClient;
 
         public WebDav(
             WebDavOptions options, HttpValidationParameters pars,
@@ -25,7 +25,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http
         public override Task CleanUp()
         {
             base.CleanUp();
-            _webdavClient = null;
+            _webdavClient.Dispose();
             return Task.CompletedTask;
         }
     }
diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDavOptions.cs b/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDavOptions.cs
index 540f135..bcb9a20 100644
--- a/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDavOptions.cs
+++ b/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDavOptions.cs
@@ -16,7 +16,7 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http
         /// <summary>
         /// Credentials to use for WebDav connection
         /// </summary>
-        public NetworkCredentialOptions Credential { get; set; }
+        public NetworkCredentialOptions? Credential { get; set; }
 
         /// <summary>
         /// Show settings to user
diff --git a/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDavOptionsFactory.cs b/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDavOptionsFactory.cs
index 49ea451..f9f358c 100644
--- a/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDavOptionsFactory.cs
+++ b/src/main.lib/Plugins/ValidationPlugins/Http/WebDav/WebDavOptionsFactory.cs
@@ -28,15 +28,15 @@ namespace PKISharp.WACS.Plugins.ValidationPlugins.Http
             };
         }
 
-        public override Task<WebDavOptions> Default(Target target)
+        public override async Task<WebDavOptions?> Default(Target target)
         {
-            return Task.FromResult(new WebDavOptions(BaseDefault(target))
+            return new WebDavOptions(BaseDefault(target))
             {
                 Credential = new NetworkCredentialOptions(_arguments)
-            });
+            };
         }
 
-        public override async Task<WebDavOptions> Aquire(Target target, IInputService inputService, RunLevel runLevel)
+        public override async Task<WebDavOptions?> Aquire(Target target, IInputService inputService, RunLevel runLevel)
         {
             return new WebDavOptions(await BaseAquire(target, inputService))
             {