diff --git a/src/SIM.Base/WebRequestHelper.cs b/src/SIM.Base/WebRequestHelper.cs
index 5f0318b0..cacf92aa 100644
--- a/src/SIM.Base/WebRequestHelper.cs
+++ b/src/SIM.Base/WebRequestHelper.cs
@@ -7,6 +7,7 @@
   using System.Threading;
   using Sitecore.Diagnostics.Base;
   using Sitecore.Diagnostics.Logging;
+  using System.Collections.Generic;
 
   public static class WebRequestHelper
   {
@@ -130,9 +131,9 @@ public static void DownloadFile(string destFileName, Stream responseStream, Canc
       }
     }
 
-    public static string DownloadString(string url, int? timeout = null, int? readWriteTimeout = null)
+    public static string DownloadString(string url, int? timeout = null, int? readWriteTimeout = null, string cookies = null, IDictionary<string, string> headers = null)
     {
-      using (var response = RequestAndGetResponse(url, timeout, readWriteTimeout))
+      using (var response = RequestAndGetResponse(url, timeout, readWriteTimeout, cookies: cookies, headers: headers))
       {
         Assert.IsNotNull(response, "No response provided");
         var stream = response.GetResponseStream();
@@ -193,14 +194,14 @@ public static string GetFileName(WebResponse response)
       return GetCookieValue(contentDisposition, "filename").Trim('"');
     }
 
-    public static HttpWebResponse RequestAndGetResponse(string url, int? timeout = null, int? readWriteTimeout = null, string cookies = null)
+    public static HttpWebResponse RequestAndGetResponse(string url, int? timeout = null, int? readWriteTimeout = null, string cookies = null, IDictionary<string, string> headers = null)
     {
-      return RequestAndGetResponse(new Uri(url), timeout, readWriteTimeout, cookies);
+      return RequestAndGetResponse(new Uri(url), timeout, readWriteTimeout, cookies, headers);
     }
 
-    public static HttpWebResponse RequestAndGetResponse(Uri uri, int? timeout = null, int? readWriteTimeout = null, string cookies = null)
+    public static HttpWebResponse RequestAndGetResponse(Uri uri, int? timeout = null, int? readWriteTimeout = null, string cookies = null, IDictionary<string, string> headers = null)
     {
-      var webRequest = CreateRequest(uri, timeout, readWriteTimeout, cookies);
+      var webRequest = CreateRequest(uri, timeout, readWriteTimeout, cookies, headers);
 
       return webRequest.GetResponse() as HttpWebResponse;
     }
@@ -214,16 +215,25 @@ private static HttpWebRequest CreateRequest(string url, int? timeout = null, int
       return CreateRequest(new Uri(url), timeout, readWriteTimeout, cookies);
     }
 
-    private static HttpWebRequest CreateRequest(Uri url, int? timeout = null, int? readWriteTimeout = null, string cookies = null)
+    private static HttpWebRequest CreateRequest(Uri url, int? timeout = null, int? readWriteTimeout = null, string cookies = null, IDictionary<string, string> headers = null)
     {
       var webRequest = (HttpWebRequest)WebRequest.Create(url);
       webRequest.Timeout = timeout ?? Settings.CoreWebDownloadConnectionTimeout.Value;
       webRequest.ReadWriteTimeout = readWriteTimeout ?? Settings.CoreWebDownloadTimeoutMinutes.Value * Minute;
+
       if (cookies != null)
       {
         webRequest.Headers.Add(HttpRequestHeader.Cookie, cookies);
       }
 
+      if (headers != null)
+      {
+        foreach (KeyValuePair<string, string> header in headers)
+        {
+          webRequest.Headers.Add(header.Key, header.Value);
+        }
+      }
+
       return webRequest;
     }
 
diff --git a/src/SIM.Instances/Instance.cs b/src/SIM.Instances/Instance.cs
index 349c5fee..37005cb0 100644
--- a/src/SIM.Instances/Instance.cs
+++ b/src/SIM.Instances/Instance.cs
@@ -414,25 +414,30 @@ public virtual string ModulesNames
     {
       get
       {
-        try
-        {
-          var omsVersions = new[] {"6.2", "6.3", "6.4"};
-          var dmsVersions = new[] {"6.5", "6.6", "7.0", "7.1", "7.2"};
-          var dmsName = omsVersions.Any(x => ProductFullName.Contains(x))
-            ? "OMS"
-            : (dmsVersions.Any(x => ProductFullName.Contains(x)) ? "DMS" : "xDB");
-
-          var modulesNames = Modules.Select(x => x.Name.TrimStart("Sitecore "));
-          return (string.Join(", ", modulesNames) +
-                  (File.Exists(Path.Combine(WebRootPath, "App_Config\\Include\\Sitecore.Analytics.config"))
-                    ? $", {dmsName}"
-                    : string.Empty)).TrimStart(" ,".ToCharArray());
-        }
-        catch (Exception ex)
+        if (this.Type == InstanceType.Sitecore8AndEarlier)
         {
-          Log.Error(ex, $"Issue with reading ModulesNames propery of {this.Name} instance.");
-          return string.Empty;
+          try
+          {
+            var omsVersions = new[] { "6.2", "6.3", "6.4" };
+            var dmsVersions = new[] { "6.5", "6.6", "7.0", "7.1", "7.2" };
+            var dmsName = omsVersions.Any(x => ProductFullName.Contains(x))
+              ? "OMS"
+              : (dmsVersions.Any(x => ProductFullName.Contains(x)) ? "DMS" : "xDB");
+
+            var modulesNames = Modules.Select(x => x.Name.TrimStart("Sitecore "));
+            return (string.Join(", ", modulesNames) +
+                    (File.Exists(Path.Combine(WebRootPath, "App_Config\\Include\\Sitecore.Analytics.config"))
+                      ? $", {dmsName}"
+                      : string.Empty)).TrimStart(" ,".ToCharArray());
+          }
+          catch (Exception ex)
+          {
+            Log.Error(ex, $"Issue with reading ModulesNames propery of {this.Name} instance.");
+            return string.Empty;
+          }
         }
+
+        return string.Empty;
       }
     }
 
diff --git a/src/SIM.Instances/InstanceManager.cs b/src/SIM.Instances/InstanceManager.cs
index 6c2c6254..04297966 100644
--- a/src/SIM.Instances/InstanceManager.cs
+++ b/src/SIM.Instances/InstanceManager.cs
@@ -105,17 +105,23 @@ public Instance GetInstance([NotNull] string name)
       Assert.ArgumentNotNull(name, nameof(name));
       Log.Debug($"InstanceManager:GetInstance('{name}')");
 
-      if (Instances == null)
+      if (PartiallyCachedInstances == null)
       {
         Initialize();
       }
 
-      if (Instances == null)
+      if (PartiallyCachedInstances == null)
       {
         return null;
       }
 
-      return PartiallyCachedInstances?[name];
+      // This is needed to make sure that the newly installed Sitecore instance is added to the collection.
+      if (!PartiallyCachedInstances.Keys.Contains(name))
+      {
+        Initialize();
+      }
+
+      return PartiallyCachedInstances.Keys.Contains(name) ? PartiallyCachedInstances[name] : null;
     }
 
     public void Initialize([CanBeNull] string defaultRootFolder = null)
diff --git a/src/SIM.Pipelines/Agent/AgentFiles.cs b/src/SIM.Pipelines/Agent/AgentFiles.cs
index 28a981d1..8c9053ca 100644
--- a/src/SIM.Pipelines/Agent/AgentFiles.cs
+++ b/src/SIM.Pipelines/Agent/AgentFiles.cs
@@ -112,6 +112,112 @@ private string GetFilePath(string name)
 
 #endregion
 
+</script>";
+
+    public const string InstallPackageContentsForSitecore9AndLater = @"
+<%@ Page Language=""C#"" AutoEventWireup=""true"" %>
+<%@ Import Namespace=""System.IO"" %>
+<%@ Import Namespace=""Sitecore.Configuration"" %>
+<%@ Import Namespace=""Sitecore.Data.Engines"" %>
+<%@ Import Namespace=""Sitecore.Diagnostics"" %>
+<%@ Import Namespace=""Sitecore.Install"" %>
+<%@ Import Namespace=""Sitecore.Install.Files"" %>
+<%@ Import Namespace=""Sitecore.Install.Framework"" %>
+<%@ Import Namespace=""Sitecore.Install.Items"" %>
+<%@ Import Namespace=""Sitecore.Install.Utils"" %>
+<%@ Import Namespace=""Sitecore.SecurityModel"" %>
+<%@ Import Namespace=""Sitecore.Security.Accounts"" %>
+
+<script runat=""server"">
+
+#region Methods
+
+  protected override void OnInitComplete(EventArgs e)
+  {
+	  this.Server.ScriptTimeout = 10*60*60; // 10 hours should be enough
+    var fileName = this.Request.QueryString[""fileName""];
+    if (string.IsNullOrEmpty(fileName))
+    {
+      this.Finish(""Error: fileName is empty"");
+      return;
+    }
+
+    var filePath = GetFilePath(fileName);
+    if (!File.Exists(filePath))
+    {
+      this.Finish(""Error: the '"" + filePath + ""' file doesn't exists"");
+      return;
+    }
+
+    try
+    {
+      Sitecore.Context.SetActiveSite(""shell"");
+      using (new UserSwitcher(""sitecore\\admin"", true))
+      {
+        using (new SyncOperationContext())
+        {
+          SimpleProcessingContext context = new SimpleProcessingContext();
+          DefaultItemInstallerEvents events = new DefaultItemInstallerEvents(new BehaviourOptions(InstallMode.Overwrite, MergeMode.Undefined));
+          context.AddAspect(events);
+          DefaultFileInstallerEvents events1 = new DefaultFileInstallerEvents(true);
+          context.AddAspect(events1);
+          this.UpdateStatus(@""Started: package is being installed"");
+          new Installer().InstallPackage(filePath, context);
+          new Installer().InstallSecurity(filePath, context);
+          this.Finish(@""Done: package installed"");
+        }
+      }
+    }
+    catch (Exception ex)
+    {
+      var inn = string.Empty;
+      if (ex.InnerException != null)
+      {
+        inn = ""\n\nInner Exception:\n"" + ex.InnerException;
+      }
+
+      this.Finish(@""Error: "" + ex + inn);
+    }
+  }
+
+  private void Finish(string message)
+  {
+    Log.Info(@""[SIM] " + InstallPackageFileName + @": "" + message, this);
+    this.UpdateStatus(message);
+    this.Response.Write(message);
+  }
+
+  private void UpdateStatus(string message)
+  {
+    var installedTemp = this.Server.MapPath(Path.Combine(Settings.TempFolderPath, ""sim.status""));
+    File.WriteAllText(installedTemp, message);
+  }
+
+  private string GetFilePath(string name)
+  {
+    Assert.ArgumentNotNullOrEmpty(name, ""name"");
+
+    var packageFolderPath = Sitecore.Configuration.Settings.PackagePath;
+    Assert.IsNotNullOrEmpty(packageFolderPath, ""packageFolderPath"");
+
+    // if path is virtual i.e. not C:\something then do a map path
+    if (packageFolderPath.Length < 2 || packageFolderPath[1] != ':')
+    {
+      packageFolderPath = packageFolderPath.TrimStart('/');
+      var prefix = ""~/"";
+      if (packageFolderPath.StartsWith(prefix))
+      {
+        packageFolderPath = packageFolderPath.Substring(prefix.Length);
+      }
+
+      packageFolderPath = Server.MapPath(prefix + packageFolderPath);
+    }
+      
+    return Path.Combine(packageFolderPath, name);      
+  }
+
+#endregion
+
 </script>";
     public const string InstallPackageFileName = @"InstallPackage.aspx";
 
diff --git a/src/SIM.Pipelines/Agent/AgentHelper.cs b/src/SIM.Pipelines/Agent/AgentHelper.cs
index 92f1a0b2..b84bef7b 100644
--- a/src/SIM.Pipelines/Agent/AgentHelper.cs
+++ b/src/SIM.Pipelines/Agent/AgentHelper.cs
@@ -52,7 +52,7 @@ public static void CopyAgentFiles([NotNull] Instance instance)
         new
         {
           FileName = AgentFiles.InstallPackageFileName, 
-          Contents = AgentFiles.InstallPackageContents
+          Contents = instance.Type == Instance.InstanceType.Sitecore9AndLater ? AgentFiles.InstallPackageContentsForSitecore9AndLater : AgentFiles.InstallPackageContents
         }, 
         new
         {
@@ -101,7 +101,7 @@ public static void DeleteAgentFiles([NotNull] Instance instance)
 
     #region Package installation
 
-    public static void InstallPackage([NotNull] Instance instance, [NotNull] Product module)
+    public static void InstallPackage([NotNull] Instance instance, [NotNull] Product module, [CanBeNull] string cookies = null, [CanBeNull] IDictionary<string, string> headers = null)
     {
       Assert.ArgumentNotNull(instance, nameof(instance));
       Assert.ArgumentNotNull(module, nameof(module));
@@ -113,10 +113,10 @@ public static void InstallPackage([NotNull] Instance instance, [NotNull] Product
 
       var statusUrl = GetUrl(instance, AgentFiles.StatusFileName);
 
-      ExecuteAgent(AgentFiles.StatusFileName, statusUrl, AgentFiles.InstallPackageFileName, installPackageUrl, PackageInstalling, PackageInstalled);
+      ExecuteAgent(AgentFiles.StatusFileName, statusUrl, AgentFiles.InstallPackageFileName, installPackageUrl, PackageInstalling, PackageInstalled, cookies: cookies, headers: headers);
     }
 
-    public static void PerformPostStepAction([NotNull] Instance instance, [NotNull] Product module)
+    public static void PerformPostStepAction([NotNull] Instance instance, [NotNull] Product module, [CanBeNull] string cookies = null, [CanBeNull] IDictionary<string, string> headers = null)
     {
       XmlDocument xmlDocument = module.Manifest;
       bool skipPostActions = module.SkipPostActions;
@@ -160,7 +160,7 @@ public static void PerformPostStepAction([NotNull] Instance instance, [NotNull]
         {
           var value = custom.Aggregate(string.Empty, (current, pair) => current + ($";{pair[0]}-{pair[1]}"));
           var postInstallUrl = GetUrl(instance, AgentFiles.PostInstallActionsFileName, value.TrimStart(';'), "custom");
-          ExecuteAgent(AgentFiles.StatusFileName, statusUrl, AgentFiles.PostInstallActionsFileName, postInstallUrl, ActionsPerforming, ActionsPerformed);
+          ExecuteAgent(AgentFiles.StatusFileName, statusUrl, AgentFiles.PostInstallActionsFileName, postInstallUrl, ActionsPerforming, ActionsPerformed, cookies: cookies, headers: headers);
           return;
         }
       }
@@ -174,7 +174,7 @@ public static void PerformPostStepAction([NotNull] Instance instance, [NotNull]
       var fileName = Path.GetFileName(module.PackagePath);
       Assert.IsNotNull(fileName, nameof(fileName));
       var url = GetUrl(instance, AgentFiles.PostInstallActionsFileName, fileName);
-      ExecuteAgent(AgentFiles.StatusFileName, statusUrl, AgentFiles.PostInstallActionsFileName, url, ActionsPerforming, ActionsPerformed);
+      ExecuteAgent(AgentFiles.StatusFileName, statusUrl, AgentFiles.PostInstallActionsFileName, url, ActionsPerforming, ActionsPerformed, cookies: cookies, headers: headers);
     }
 
     #endregion
@@ -190,7 +190,7 @@ public static string GetUrl(Instance instance, string pageName, string value = n
     }
 
     [NotNull]
-    public static string Request([NotNull] string url, [NotNull] string pageName)
+    public static string Request([NotNull] string url, [NotNull] string pageName, [CanBeNull] string cookies = null, [CanBeNull] IDictionary<string, string> headers = null)
     {
       Assert.ArgumentNotNull(url, nameof(url));
       Assert.ArgumentNotNullOrEmpty(pageName, nameof(pageName));
@@ -200,7 +200,7 @@ public static string Request([NotNull] string url, [NotNull] string pageName)
       try
       {
         Log.Info($"Requesting URL {url}");
-        result = WebRequestHelper.DownloadString(url).Trim();
+        result = WebRequestHelper.DownloadString(url, cookies: cookies, headers: headers).Trim();
         if (result.ToLower().StartsWith("error:"))
         {
           throw new InvalidOperationException(errorPrefix + result);
@@ -222,10 +222,10 @@ public static string Request([NotNull] string url, [NotNull] string pageName)
 
     #region Private methods
 
-    private static void ExecuteAgent(string statusFileName, string statusUrl, string agentName, string operationUrl, string operationStartedStatus, string operationCompletedStatus)
+    private static void ExecuteAgent(string statusFileName, string statusUrl, string agentName, string operationUrl, string operationStartedStatus, string operationCompletedStatus, string cookies = null, IDictionary<string, string> headers = null)
     {
       // Call agent main operation
-      var status = Request(operationUrl, agentName);
+      var status = Request(operationUrl, agentName, cookies: cookies, headers: headers);
 
       // If the package installation process takes more than http timeout, retrive status
       if (status != operationCompletedStatus)
@@ -233,7 +233,7 @@ private static void ExecuteAgent(string statusFileName, string statusUrl, string
         // Retrive status while the previous request timed out, status is in progress or package is already being installed
         while (status == TimedOut || status == InProgress || status == operationStartedStatus)
         {
-          status = Request(statusUrl, statusFileName);
+          status = Request(statusUrl, statusFileName, cookies: cookies, headers: headers);
           Thread.Sleep(2000);
         }
 
diff --git a/src/SIM.Pipelines/Install/Modules/InstallPackages.cs b/src/SIM.Pipelines/Install/Modules/InstallPackages.cs
index 0e1cfcdd..36ee3810 100644
--- a/src/SIM.Pipelines/Install/Modules/InstallPackages.cs
+++ b/src/SIM.Pipelines/Install/Modules/InstallPackages.cs
@@ -6,13 +6,14 @@ namespace SIM.Pipelines.Install.Modules
   using SIM.Products;
   using Sitecore.Diagnostics.Base;
   using JetBrains.Annotations;
+  using SIM.Pipelines.InstallModules;
 
   #region
 
   #endregion
 
   [UsedImplicitly]
-  public class InstallPackages : InstallProcessor
+  public class InstallPackages : InstallModulesProcessor
   {
     #region Fields
 
@@ -22,7 +23,7 @@ public class InstallPackages : InstallProcessor
 
     #region Methods
 
-    protected override void Process([NotNull] InstallArgs args)
+    protected override void Process([NotNull] InstallModulesArgs args)
     {
       Assert.ArgumentNotNull(args, nameof(args));
 
@@ -35,7 +36,7 @@ protected override void Process([NotNull] InstallArgs args)
           continue;
         }
 
-        AgentHelper.InstallPackage(args.Instance, module);
+        AgentHelper.InstallPackage(args.Instance, module, args.Cookies, args.Headers);
 
         _Done.Add(module);
       }
diff --git a/src/SIM.Pipelines/InstallModules/InstallModulesArgs.cs b/src/SIM.Pipelines/InstallModules/InstallModulesArgs.cs
index 1027480e..db1b1d46 100644
--- a/src/SIM.Pipelines/InstallModules/InstallModulesArgs.cs
+++ b/src/SIM.Pipelines/InstallModules/InstallModulesArgs.cs
@@ -23,11 +23,15 @@ public class InstallModulesArgs : ProcessorArgs
 
     private string instanceName { get; }
 
+    public string Cookies { get; }
+
+    public IDictionary<string, string> Headers { get; }
+
     #endregion
 
     #region Constructors
 
-    public InstallModulesArgs([NotNull] Instance instance, [NotNull] IEnumerable<Product> modules, [CanBeNull] SqlConnectionStringBuilder connectionString = null)
+    public InstallModulesArgs([NotNull] Instance instance, [NotNull] IEnumerable<Product> modules, [CanBeNull] SqlConnectionStringBuilder connectionString = null, [CanBeNull] string cookies = null, [CanBeNull] IDictionary<string, string> headers = null)
     {
       Assert.ArgumentNotNull(instance, nameof(instance));
       Assert.ArgumentNotNull(modules, nameof(modules));
@@ -36,6 +40,8 @@ public InstallModulesArgs([NotNull] Instance instance, [NotNull] IEnumerable<Pro
       ConnectionString = connectionString;
       Instance = instance;
       instanceName = instance.Name;
+      Cookies = cookies;
+      Headers = headers;
     }
 
     #endregion
diff --git a/src/SIM.Pipelines/InstallModules/InstallPackages.cs b/src/SIM.Pipelines/InstallModules/InstallPackages.cs
index 0b2e1b13..8f6cecb8 100644
--- a/src/SIM.Pipelines/InstallModules/InstallPackages.cs
+++ b/src/SIM.Pipelines/InstallModules/InstallPackages.cs
@@ -35,7 +35,7 @@ protected override void Process([NotNull] InstallModulesArgs args)
           continue;
         }
 
-        AgentHelper.InstallPackage(args.Instance, module);
+        AgentHelper.InstallPackage(args.Instance, module, args.Cookies, args.Headers);
 
         _Done.Add(module);
       }
diff --git a/src/SIM.Pipelines/InstallModules/PerformPostStepActions.cs b/src/SIM.Pipelines/InstallModules/PerformPostStepActions.cs
index 6480cab2..877b5503 100644
--- a/src/SIM.Pipelines/InstallModules/PerformPostStepActions.cs
+++ b/src/SIM.Pipelines/InstallModules/PerformPostStepActions.cs
@@ -37,7 +37,7 @@ protected override void Process([NotNull] InstallModulesArgs args)
           continue;
         }
 
-        AgentHelper.PerformPostStepAction(args.Instance, module);
+        AgentHelper.PerformPostStepAction(args.Instance, module, args.Cookies, args.Headers);
 
         _Done.Add(module);
       }
diff --git a/src/SIM.Sitecore9Installer/Tasker.cs b/src/SIM.Sitecore9Installer/Tasker.cs
index 97b4d6c4..e4fd70df 100644
--- a/src/SIM.Sitecore9Installer/Tasker.cs
+++ b/src/SIM.Sitecore9Installer/Tasker.cs
@@ -50,7 +50,7 @@ public Tasker(string root, string installationPackageName, string deployRoot, bo
       this.GlobalParams = new GlobalParameters(this.doc, this.FilesRoot);
       EventManager.Instance.ParamValueUpdated += this.GlobalParamValueUpdated;
       UnInstall = unInstall;
-      LoadTasks();
+      LoadTasks(this.FilesRoot);
     }
 
     public Tasker(string unInstallParamsPath) : this()
@@ -89,7 +89,7 @@ public Tasker(string unInstallParamsPath) : this()
         }
       }
 
-      this.LoadTasks();
+      this.LoadTasks(unInstallTasksPath);
       List<string> uninstallTasksNames = Directory.GetFiles(unInstallParamsPath, "*.json")
         .Where(name => !Path.GetFileName(name).Equals("globals.json", StringComparison.InvariantCultureIgnoreCase))
         .ToList();
@@ -122,10 +122,10 @@ public Tasker(string unInstallParamsPath) : this()
       EventManager.Instance.ParamValueUpdated += this.GlobalParamValueUpdated;
     }
 
-    private Task CreateTask(int order, JProperty taskDescriptor)
+    private Task CreateTask(int order, JProperty taskDescriptor, string taskFolder)
     {
       TaskDefinition definition = new TaskDefinition(taskDescriptor);
-      return definition.CreateTask(order, this.GlobalParams, this.FilesRoot, this.UnInstall, this.mapping);
+      return definition.CreateTask(order, this.GlobalParams, taskFolder, this.UnInstall, this.mapping);
     }
 
     private void LoadValidators()
@@ -323,13 +323,13 @@ public void GenerateScripts()
         }
     }
 
-    private void LoadTasks()
+    private void LoadTasks(string path)
     {
       int order = 0;
       foreach (JProperty param in doc["ExecSequense"].Children())
       {        
         string realName = GetTaskRealName(param);
-        string taskFile = Directory.GetFiles(FilesRoot, string.Format("{0}.json", realName), SearchOption.AllDirectories)
+        string taskFile = Directory.GetFiles(path, string.Format("{0}.json", realName), SearchOption.AllDirectories)
           .FirstOrDefault();
         if (!string.IsNullOrEmpty(taskFile))
         {
@@ -340,7 +340,7 @@ private void LoadTasks()
           }
         }
 
-        Task t = this.CreateTask(order, param);
+        Task t = this.CreateTask(order, param, path);
         t.UnInstall = UnInstall;
         this.Tasks.Add(t);
         if (order != t.ExecutionOrder && t.ExecutionOrder >= 0)
diff --git a/src/SIM.Sitecore9Installer/Tasks/TaskDefinition.cs b/src/SIM.Sitecore9Installer/Tasks/TaskDefinition.cs
index c07a2c0c..87ae66b3 100644
--- a/src/SIM.Sitecore9Installer/Tasks/TaskDefinition.cs
+++ b/src/SIM.Sitecore9Installer/Tasks/TaskDefinition.cs
@@ -72,7 +72,7 @@ private LocalParameters GetTaskParameters(string taskFolder, GlobalParameters gl
           p.Value = globalParams[p.Name].Value;
         installParams.Add(p);
 
-        if (p.Name == "Package")
+        if (p.Name == "Package" && !unInstall)
         {          
             p.Value = mapping.Map(this.TaskName, taskFolder);
         }
diff --git a/src/SIM.Tool.Base/Pipelines/InstallModulesWizardArgs.cs b/src/SIM.Tool.Base/Pipelines/InstallModulesWizardArgs.cs
index 98333d48..4f481746 100644
--- a/src/SIM.Tool.Base/Pipelines/InstallModulesWizardArgs.cs
+++ b/src/SIM.Tool.Base/Pipelines/InstallModulesWizardArgs.cs
@@ -21,6 +21,10 @@ public class InstallModulesWizardArgs : WizardArgs
 
     private string _WebRootPath;
 
+    public string Cookies { get; }
+
+    public IDictionary<string, string> Headers { get; }
+
     #endregion
 
     #region Constructors
@@ -29,13 +33,16 @@ public InstallModulesWizardArgs()
     { 
     }
 
-    public InstallModulesWizardArgs(Instance instance)
+    public InstallModulesWizardArgs(Instance instance, string cookies = null, IDictionary<string, string> headers = null)
     {
       Instance = instance;
       if (instance != null)
       {
         WebRootPath = instance.WebRootPath;
       }
+
+      Cookies = cookies;
+      Headers = headers;
     }
 
     #endregion
@@ -81,7 +88,7 @@ public override ProcessorArgs ToProcessorArgs()
         products.Add(product);
       }
 
-      return new InstallModulesArgs(Instance, products, connectionString);
+      return new InstallModulesArgs(Instance, products, connectionString, Cookies, Headers);
     }
 
     #endregion
diff --git a/src/SIM.Tool.Windows/Dialogs/CredentialsContext.cs b/src/SIM.Tool.Windows/Dialogs/CredentialsContext.cs
new file mode 100644
index 00000000..87085eca
--- /dev/null
+++ b/src/SIM.Tool.Windows/Dialogs/CredentialsContext.cs
@@ -0,0 +1,18 @@
+namespace SIM.Tool.Windows.Dialogs
+{
+  public class CredentialsContext
+  {
+    public string UserName { get; }
+
+    public string Password { get; }
+
+    public string Uri { get; }
+
+    public CredentialsContext(string userName, string password, string uri = null)
+    {
+      this.UserName = userName;
+      this.Password = password;
+      this.Uri = uri;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/SIM.Tool.Windows/Dialogs/CredentialsDialog.xaml b/src/SIM.Tool.Windows/Dialogs/CredentialsDialog.xaml
new file mode 100644
index 00000000..d7e54d83
--- /dev/null
+++ b/src/SIM.Tool.Windows/Dialogs/CredentialsDialog.xaml
@@ -0,0 +1,34 @@
+<Window x:Class="SIM.Tool.Windows.Dialogs.CredentialsDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:SIM.Tool.Windows.Dialogs"
+        mc:Ignorable="d"
+        Title="Credentials" Height="140" Width="310"
+        ResizeMode="NoResize" Loaded="Window_Loaded">
+    <Grid>
+        <StackPanel>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="15*"></ColumnDefinition>
+                    <ColumnDefinition Width="27*"></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Name="IdentityServerUriRow" Height="25"></RowDefinition>
+                    <RowDefinition Height="25"></RowDefinition>
+                    <RowDefinition Height="25"></RowDefinition>
+                    <RowDefinition Height="25"></RowDefinition>
+                </Grid.RowDefinitions>
+                <TextBlock Name="IdentityServerUri" Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" TextWrapping="Wrap" Text="Identity Server URI:" Height="16" Margin="4,4,0,6"/>
+                <TextBox Name="IdentityServerUriText" VerticalContentAlignment="Center" Grid.Column="1" Grid.Row="0" Margin="0,0,2,0" />
+                <TextBlock Name="UserName" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" TextWrapping="Wrap" Text="User name:" Height="16" Margin="4,4,0,6"/>
+                <TextBox Name="UserNameText" Grid.Column="1" Grid.Row="1" VerticalContentAlignment="Center" Margin="0,0,2,0" />
+                <TextBlock Name="Password" Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" TextWrapping="Wrap" Text="Password:" Height="16" Margin="4,4,0,6"/>
+                <TextBox Name="PasswordText" VerticalContentAlignment="Center" Grid.Column="1" Grid.Row="2" Margin="0,0,2,0" />
+                <Button Content="OK" Name="OK" Click="OK_OnClick"  Grid.Column="1" HorizontalAlignment="Right" Grid.Row="3" Width="75" Margin="0,4,82,2"/>
+                <Button Content="Cancel" Name="Cancel" Click="Cancel_OnClick" Grid.Column="1" HorizontalAlignment="Right" Margin="0,4,2,2" Grid.Row="3" Width="75"/>
+            </Grid>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/src/SIM.Tool.Windows/Dialogs/CredentialsDialog.xaml.cs b/src/SIM.Tool.Windows/Dialogs/CredentialsDialog.xaml.cs
new file mode 100644
index 00000000..5b15af7a
--- /dev/null
+++ b/src/SIM.Tool.Windows/Dialogs/CredentialsDialog.xaml.cs
@@ -0,0 +1,47 @@
+using System.Windows;
+using Sitecore.Diagnostics.Base;
+
+namespace SIM.Tool.Windows.Dialogs
+{
+  /// <summary>
+  /// Interaction logic for CredentialsDialog.xaml
+  /// </summary>
+  public partial class CredentialsDialog : Window
+  {
+    public CredentialsDialog()
+    {
+      InitializeComponent();
+    }
+
+    private void Window_Loaded(object sender, RoutedEventArgs e)
+    {
+      CredentialsContext credentialsContext = this.DataContext as CredentialsContext;
+      Assert.ArgumentNotNull(credentialsContext, nameof(credentialsContext));
+
+      UserNameText.Text = credentialsContext.UserName;
+      PasswordText.Text = credentialsContext.Password;
+      if (string.IsNullOrEmpty(credentialsContext.Uri))
+      {
+        IdentityServerUriRow.Height = new GridLength(0);
+        this.Height = 116;
+      }
+      else
+      {
+        IdentityServerUriText.Text = credentialsContext.Uri;
+      }
+    }
+
+    private void OK_OnClick(object sender, RoutedEventArgs e)
+    {
+      this.DataContext = new CredentialsContext(UserNameText.Text, PasswordText.Text, IdentityServerUriText.Text);
+      this.DialogResult = true;
+      this.Close();
+    }
+
+    private void Cancel_OnClick(object sender, RoutedEventArgs e)
+    {
+      this.DialogResult = false;
+      this.Close();
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/SIM.Tool.Windows/MainWindowComponents/Buttons/InstallModulesForSitecore9AndLaterButton.cs b/src/SIM.Tool.Windows/MainWindowComponents/Buttons/InstallModulesForSitecore9AndLaterButton.cs
new file mode 100644
index 00000000..06fa88cb
--- /dev/null
+++ b/src/SIM.Tool.Windows/MainWindowComponents/Buttons/InstallModulesForSitecore9AndLaterButton.cs
@@ -0,0 +1,197 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Threading.Tasks;
+using System.Windows;
+using JetBrains.Annotations;
+using SIM.Core;
+using SIM.Instances;
+using SIM.Tool.Base;
+using SIM.Tool.Base.Pipelines;
+using SIM.Tool.Base.Wizards;
+using SIM.Tool.Windows.Dialogs;
+using SIM.Tool.Windows.UserControls.SitecoreAuthentication;
+
+namespace SIM.Tool.Windows.MainWindowComponents.Buttons
+{
+  [UsedImplicitly]
+  public class InstallModulesForSitecore9AndLaterButton : InstanceOnlyButton
+  {
+    public override void OnClick(Window mainWindow, Instance instance)
+    {
+      if (instance != null)
+      {
+        Dictionary<string, string> headers = null;
+        string authCookieOrIdServerAuthToken = null;
+
+        int.TryParse(instance.Product.ShortVersion, out int sitecoreVersion);
+        if (sitecoreVersion >= 91)
+        {
+          string sitecoreIdServerUri = "https://" + instance.SitecoreEnvironment.Name + "Id.local";
+          authCookieOrIdServerAuthToken = this.GetAuthToken(sitecoreIdServerUri, CoreAppSettings.AppLoginAsAdminUserName.Value, CoreAppSettings.AppLoginAsAdminNewPassword.Value, mainWindow);
+          authCookieOrIdServerAuthToken = this.ValidateAuthToken(authCookieOrIdServerAuthToken, sitecoreIdServerUri,
+            CoreAppSettings.AppLoginAsAdminUserName.Value, CoreAppSettings.AppLoginAsAdminNewPassword.Value, mainWindow);
+
+          if (string.IsNullOrEmpty(authCookieOrIdServerAuthToken))
+          {
+            return;
+          }
+
+          headers = new Dictionary<string, string> { { "Authorization", authCookieOrIdServerAuthToken } };
+        }
+        else if (sitecoreVersion == 90)
+        {
+          string instanceUri = instance.GetUrl();
+
+          if (!this.IsInstanceUriValid(instanceUri))
+          {
+            return;
+          }
+
+          authCookieOrIdServerAuthToken = this.GetAuthCookie(instanceUri, CoreAppSettings.AppLoginAsAdminUserName.Value, CoreAppSettings.AppLoginAsAdminNewPassword.Value, mainWindow);
+          authCookieOrIdServerAuthToken = this.ValidateAuthCookie(authCookieOrIdServerAuthToken, instanceUri, 
+            CoreAppSettings.AppLoginAsAdminUserName.Value, CoreAppSettings.AppLoginAsAdminNewPassword.Value, mainWindow);
+
+          if (string.IsNullOrEmpty(authCookieOrIdServerAuthToken))
+          {
+            return;
+          }
+        }
+
+        var id = MainWindowHelper.GetListItemID(instance.ID);
+        WizardPipelineManager.Start("installmodules", mainWindow, null, null, ignore => MainWindowHelper.MakeInstanceSelected(id), () => new InstallModulesWizardArgs(instance, authCookieOrIdServerAuthToken, headers));
+      }
+    }
+
+    private string GetAuthToken(string sitecoreIdServerUri, string userName, string password, Window mainWindow)
+    {
+      string idServerAuthToken = null;
+
+      WindowHelper.LongRunningTask(() =>
+      {
+        var task = Task.Run(async () => {
+          idServerAuthToken = await
+            SitecoreIdServerAuth.GetToken(sitecoreIdServerUri, userName, password);
+        });
+        task?.Wait();
+      }, "Get authentication token", mainWindow, "Getting authentication token", "", true);
+
+      return idServerAuthToken;
+    }
+
+    private string ValidateAuthToken(string idServerAuthToken, string sitecoreIdServerUri, string userName, string password, Window mainWindow)
+    {
+      if (SitecoreIdServerAuth.CurrentHttpStatusCode == HttpStatusCode.InternalServerError)
+      {
+        WindowHelper.HandleError("Unable to get authentication token using the following Sitecore Identity Server URI:\n\n" +
+                                 sitecoreIdServerUri, true);
+        return null;
+      }
+      else if (SitecoreIdServerAuth.CurrentHttpStatusCode != HttpStatusCode.OK && SitecoreIdServerAuth.CurrentHttpStatusCode != HttpStatusCode.BadRequest)
+      {
+        WindowHelper.ShowMessage(
+          "Unable to get authentication token using the following Sitecore Identity Server URI:\n\n" +
+          sitecoreIdServerUri +
+          "\n\nThe '" + SitecoreIdServerAuth.CurrentHttpStatusCode + "' status code has been returned." +
+          "\n\nPlease make sure that this Sitecore Identity Server is running.",
+          MessageBoxButton.OK,
+          MessageBoxImage.Warning);
+        return null;
+      }
+
+      if (SitecoreIdServerAuth.CurrentHttpStatusCode == HttpStatusCode.BadRequest)
+      {
+        if (WindowHelper.ShowMessage(
+              "Unable to get authentication token using the following data:\n\nIdentity Server URI: " + sitecoreIdServerUri +
+              "\nUser name: " + userName + "\nPassword: " + password + "\n\nWould you like to try to continue installation using other URI and credentials?",
+              MessageBoxButton.YesNo,
+              MessageBoxImage.Warning) == MessageBoxResult.Yes)
+        {
+          CredentialsContext credentialsContext =
+            WindowHelper.ShowDialog<CredentialsDialog>(new CredentialsContext(userName, password, sitecoreIdServerUri), null) as CredentialsContext;
+          if (credentialsContext != null)
+          {
+            idServerAuthToken = this.GetAuthToken(credentialsContext.Uri, credentialsContext.UserName, credentialsContext.Password, mainWindow);
+            this.ValidateAuthToken(idServerAuthToken, credentialsContext.Uri, credentialsContext.UserName, credentialsContext.Password, mainWindow);
+          }
+        }
+      }
+
+      return idServerAuthToken;
+    }
+
+    private string GetAuthCookie(string instanceUri, string userName, string password, Window mainWindow)
+    {
+      string authCookie = null;
+
+      WindowHelper.LongRunningTask(() =>
+      {
+        var task = Task.Run(async () => {
+          authCookie = await
+            SitecoreServicesClientAuth.GetCookie(instanceUri, userName, password);
+        });
+        task?.Wait();
+      }, "Get authentication cookie", mainWindow, "Getting authentication cookie", "", true);
+
+      return authCookie;
+    }
+
+    private string ValidateAuthCookie(string authCookie, string instanceUri, string userName, string password, Window mainWindow)
+    {
+      if (SitecoreServicesClientAuth.CurrentHttpStatusCode == HttpStatusCode.InternalServerError)
+      {
+        WindowHelper.HandleError("Unable to get authentication cookie using the following Sitecore instance URI:\n\n" + 
+                                 instanceUri +
+                                 "\n\nPlease make sure that a valid certificate is used for the SSL binding of your Sitecore site.", true);
+        return null;
+      }
+      else if (SitecoreServicesClientAuth.CurrentHttpStatusCode != HttpStatusCode.OK && SitecoreServicesClientAuth.CurrentHttpStatusCode != HttpStatusCode.Forbidden)
+      {
+        WindowHelper.ShowMessage(
+          "Unable to get authentication cookie using the following Sitecore instance URI:\n\n" +
+          instanceUri +
+          "\n\nThe '" + SitecoreServicesClientAuth.CurrentHttpStatusCode + "' status code has been returned." +
+          "\n\nPlease make sure that this Sitecore site is running.",
+          MessageBoxButton.OK,
+          MessageBoxImage.Warning);
+        return null;
+      }
+
+      if (SitecoreServicesClientAuth.CurrentHttpStatusCode == HttpStatusCode.Forbidden)
+      {
+        if (WindowHelper.ShowMessage(
+              "Unable to get authentication cookie using the following credentials:\n\n" +
+              "User name: " + userName + "\nPassword: " + password + "\n\nWould you like to try to continue installation using other credentials?", 
+              MessageBoxButton.YesNo,
+              MessageBoxImage.Warning) == MessageBoxResult.Yes)
+        {
+          CredentialsContext credentialsContext = 
+            WindowHelper.ShowDialog<CredentialsDialog>(new CredentialsContext(userName, password), null) as CredentialsContext;
+          if (credentialsContext != null)
+          {
+            authCookie = this.GetAuthCookie(instanceUri, credentialsContext.UserName, credentialsContext.Password, mainWindow);
+            this.ValidateAuthCookie(authCookie, instanceUri, credentialsContext.UserName, credentialsContext.Password, mainWindow);
+          }
+        }
+      }
+
+      return authCookie;
+    }
+
+    private bool IsInstanceUriValid(string instanceUri)
+    { 
+      if (!instanceUri.StartsWith("https://", StringComparison.InvariantCultureIgnoreCase))
+      {
+        WindowHelper.ShowMessage(
+          "The selected Sitecore instance does not use SSL/TLS connection according to the following URI:\n\n" +
+          instanceUri +
+          "\n\nThe SSC Auth services that are needed for package installation require an SSL/TLS connection, so you need to set up a valid certificate and SSL binding for your Sitecore site.",
+          MessageBoxButton.OK,
+          MessageBoxImage.Warning);
+        return false;
+      }
+
+      return true;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/SIM.Tool.Windows/MainWindowData.cs b/src/SIM.Tool.Windows/MainWindowData.cs
index a25a9ac1..46e9cc64 100644
--- a/src/SIM.Tool.Windows/MainWindowData.cs
+++ b/src/SIM.Tool.Windows/MainWindowData.cs
@@ -685,6 +685,12 @@ private static ButtonDefinition GetPatchButton()
               Image = "/Images/$lg/install.png, SIM.Tool.Windows",
               Handler = new InstallModulesButton()
             },
+            new ButtonDefinition
+            {
+              Label = "Install Packages",
+              Image = "/Images/$lg/install.png, SIM.Tool.Windows",
+              Handler = new InstallModulesForSitecore9AndLaterButton()
+            },
           }
         },
         GetManageGroupDefinition(),
@@ -1153,7 +1159,9 @@ private static GroupDefinition GetManageGroupDefinition()
       new ButtonDefinition { Handler = new ExportInstanceButton() },
       new ButtonDefinition { Label = "Export", Image = "/Images/$sm/download.png, SIM.Tool.Windows", Handler = new ExportInstanceButton() },
       new ButtonDefinition { Handler = new InstallModulesButton() },
-      new ButtonDefinition { Label = "Install modules", Image = "/Images/$sm/install.png, SIM.Tool.Windows", Handler = new InstallModulesButton() },
+      new ButtonDefinition { Label = "Install packages", Image = "/Images/$sm/install.png, SIM.Tool.Windows", Handler = new InstallModulesButton() },
+      new ButtonDefinition { Handler = new InstallModulesButton() },
+      new ButtonDefinition { Label = "Install packages", Image = "/Images/$sm/install.png, SIM.Tool.Windows", Handler = new InstallModulesForSitecore9AndLaterButton() },
       new ButtonDefinition { Handler = new ReinstallInstanceButton() },
       new ButtonDefinition { Label = "Reinstall instance", Image = "/Images/$sm/redo.png, SIM.Tool.Windows", Handler = new ReinstallInstanceButton() },
       new ButtonDefinition { Handler = new DeleteInstanceButton() },
diff --git a/src/SIM.Tool.Windows/Pipelines/Download8/Download8Args.cs b/src/SIM.Tool.Windows/Pipelines/Download8/Download8Args.cs
index 5829a754..47b853e3 100644
--- a/src/SIM.Tool.Windows/Pipelines/Download8/Download8Args.cs
+++ b/src/SIM.Tool.Windows/Pipelines/Download8/Download8Args.cs
@@ -12,7 +12,7 @@ public class Download8Args : ProcessorArgs
   {
     #region Fields
 
-    [NotNull]
+    [CanBeNull]
     public string Cookies { get; }
 
     [NotNull]
@@ -28,9 +28,8 @@ public class Download8Args : ProcessorArgs
 
     #region Constructors
 
-    public Download8Args([NotNull] string cookies, [NotNull] ReadOnlyCollection<Uri> links, [NotNull] string localRepository)
+    public Download8Args([CanBeNull] string cookies, [NotNull] ReadOnlyCollection<Uri> links, [NotNull] string localRepository)
     {
-      Assert.ArgumentNotNull(cookies, nameof(cookies));
       Assert.ArgumentNotNull(links, nameof(links));
       Assert.ArgumentNotNull(localRepository, nameof(localRepository));
       LocalRepository = localRepository;
diff --git a/src/SIM.Tool.Windows/Pipelines/Install/FinishActions.cs b/src/SIM.Tool.Windows/Pipelines/Install/FinishActions.cs
index c8b904c3..dfca38ee 100644
--- a/src/SIM.Tool.Windows/Pipelines/Install/FinishActions.cs
+++ b/src/SIM.Tool.Windows/Pipelines/Install/FinishActions.cs
@@ -15,13 +15,13 @@ public static class FinishActions
     [UsedImplicitly]
     public static void OpenBrowser(ReinstallWizardArgs args)
     {
-      InstanceHelperEx.BrowseInstance(args.Instance, args.WizardWindow, string.Empty, true);
+      InstanceHelperEx.BrowseInstance(args.Instance, args.WizardWindow.Owner, string.Empty, true);
     }
 
     [UsedImplicitly]
     public static void OpenSitecoreClient(ReinstallWizardArgs args)
     {
-      InstanceHelperEx.BrowseInstance(args.Instance, args.WizardWindow, "/sitecore", false);
+      InstanceHelperEx.BrowseInstance(args.Instance, args.WizardWindow.Owner, "/sitecore", false);
     }
 
     [UsedImplicitly]
diff --git a/src/SIM.Tool.Windows/Pipelines/Install/InstallActions.cs b/src/SIM.Tool.Windows/Pipelines/Install/InstallActions.cs
index 63c33cf4..23db8176 100644
--- a/src/SIM.Tool.Windows/Pipelines/Install/InstallActions.cs
+++ b/src/SIM.Tool.Windows/Pipelines/Install/InstallActions.cs
@@ -24,32 +24,24 @@ public static class InstallActions
   {
     #region Public methods
 
-    [UsedImplicitly]
-    public static void BackupInstance(InstallModulesWizardArgs args)
-    {
-      var id = MainWindowHelper.GetListItemID(args.Instance.ID);
-      Assert.IsTrue(id >= 0, "id ({0}) should be >= 0".FormatWith(id));
-      WizardPipelineManager.Start("backup", args.WizardWindow, new BackupArgs(args.Instance, ProfileManager.GetConnectionString(), null, true, true), null, ignore => MainWindowHelper.MakeInstanceSelected(id), () => new BackupSettingsWizardArgs(args.Instance));
-    }
-
     [UsedImplicitly]
     public static void BackupInstance(InstallWizardArgs args)
     {
       var id = MainWindowHelper.GetListItemID(args.Instance.ID);
       Assert.IsTrue(id >= 0, "id ({0}) should be >= 0".FormatWith(id));
-      WizardPipelineManager.Start("backup", args.WizardWindow, new BackupArgs(args.Instance, ProfileManager.GetConnectionString(), null, true, true), null, ignore => MainWindowHelper.MakeInstanceSelected(id), () => new BackupSettingsWizardArgs(args.Instance));
+      WizardPipelineManager.Start("backup", args.WizardWindow.Owner, new BackupArgs(args.Instance, ProfileManager.GetConnectionString(), null, true, true), null, ignore => MainWindowHelper.MakeInstanceSelected(id), () => new BackupSettingsWizardArgs(args.Instance));
     }
 
     [UsedImplicitly]
     public static void OpenBrowser(InstallWizardArgs args)
     {
-      InstanceHelperEx.BrowseInstance(args.Instance, args.WizardWindow, String.Empty, true);
+      InstanceHelperEx.BrowseInstance(args.Instance, args.WizardWindow.Owner, String.Empty, true);
     }
 
     [UsedImplicitly]
     public static void OpenSitecoreClient(InstallWizardArgs args)
     {
-      InstanceHelperEx.BrowseInstance(args.Instance, args.WizardWindow, "/sitecore", false);
+      InstanceHelperEx.BrowseInstance(args.Instance, args.WizardWindow.Owner, "/sitecore", false);
     }
 
     [UsedImplicitly]
diff --git a/src/SIM.Tool.Windows/SIM.Tool.Windows.csproj b/src/SIM.Tool.Windows/SIM.Tool.Windows.csproj
index 82718347..0576b934 100644
--- a/src/SIM.Tool.Windows/SIM.Tool.Windows.csproj
+++ b/src/SIM.Tool.Windows/SIM.Tool.Windows.csproj
@@ -99,6 +99,7 @@
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\ControlzEx.2.0.1.61\lib\net45\System.Windows.Interactivity.dll</HintPath>
@@ -126,6 +127,10 @@
     <Compile Include="Dialogs\AddSolrDialog.xaml.cs">
       <DependentUpon>AddSolrDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Dialogs\CredentialsContext.cs" />
+    <Compile Include="Dialogs\CredentialsDialog.xaml.cs">
+      <DependentUpon>CredentialsDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Dialogs\DatabaseQueryExecutionDialog.xaml.cs">
       <DependentUpon>DatabaseQueryExecutionDialog.xaml</DependentUpon>
     </Compile>
@@ -152,6 +157,7 @@
     <Compile Include="MainWindowComponents\Buttons\BrowseSitecoreContainerWebsiteButton.cs" />
     <Compile Include="MainWindowComponents\Buttons\BrowseHomePageButton.cs" />
     <Compile Include="MainWindowComponents\Buttons\CreateSupportHotfixButton.cs" />
+    <Compile Include="MainWindowComponents\Buttons\InstallModulesForSitecore9AndLaterButton.cs" />
     <Compile Include="MainWindowComponents\Buttons\InstanceDummyButton.cs" />
     <Compile Include="MainWindowComponents\Buttons\LogFilesButton.cs" />
     <Compile Include="MainWindowComponents\Buttons\OpenContainerFolderButton.cs" />
@@ -266,9 +272,6 @@
       <DependentUpon>Downloads.xaml</DependentUpon>
     </Compile>
     <Compile Include="UserControls\Download8\DownloadWizardArgs.xaml.cs" />
-    <Compile Include="UserControls\Download8\Login.xaml.cs">
-      <DependentUpon>Login.xaml</DependentUpon>
-    </Compile>
     <Compile Include="UserControls\Download8\ProductDownload8InCheckbox.cs" />
     <Compile Include="UserControls\Export\ExportDatabases.xaml.cs">
       <DependentUpon>ExportDatabases.xaml</DependentUpon>
@@ -279,6 +282,8 @@
     <Compile Include="UserControls\Export\ExportWizardArgs.cs" />
     <Compile Include="UserControls\Export\FinishActions.cs" />
     <Compile Include="UserControls\Helpers\InstallTasksHelper.cs" />
+    <Compile Include="UserControls\SitecoreAuthentication\SitecoreServicesClientAuth.cs" />
+    <Compile Include="UserControls\SitecoreAuthentication\SitecoreIdServerAuth.cs" />
     <Compile Include="UserControls\Import\ImportWebsite.xaml.cs">
       <DependentUpon>ImportWebsite.xaml</DependentUpon>
     </Compile>
@@ -624,6 +629,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Dialogs\CredentialsDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Dialogs\DatabaseQueryExecutionDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -760,10 +769,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="UserControls\Download8\Login.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="UserControls\Download8\Downloads.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/src/SIM.Tool.Windows/UserControls/Download8/Login.xaml b/src/SIM.Tool.Windows/UserControls/Download8/Login.xaml
deleted file mode 100644
index a616be0f..00000000
--- a/src/SIM.Tool.Windows/UserControls/Download8/Login.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<UserControl x:Class="SIM.Tool.Windows.UserControls.Download8.Login" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" mc:Ignorable="d" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="269" d:DesignWidth="421">
-  <StackPanel Grid.Row="1" Margin="0">
-    <TextBlock Margin="0" HorizontalAlignment="Stretch" VerticalAlignment="Top" Name="TextBlock" TextWrapping="Wrap" TextAlignment="Justify" />
-    <!-- Background="#FFF0F0F0" -->
-    <WebBrowser Name="webBrowser" Width="0" Height="0" />
-    <TextBlock TextWrapping="Wrap" HorizontalAlignment="Stretch" TextAlignment="Justify" Margin="0" Padding="0">
-      <Bold>SDN User Name</Bold> - your email address 
-    </TextBlock>
-    <TextBox Name="UserName" HorizontalAlignment="Stretch" Margin="0 4 0 4" />
-    <TextBlock TextWrapping="Wrap"  HorizontalAlignment="Stretch" TextAlignment="Justify" Padding="0">
-      <Bold>SDN Password</Bold> - your password
-    </TextBlock>
-    <PasswordBox Name="Passowrd" HorizontalAlignment="Stretch" Margin="0 4 0 4" Height="24" />
-    <TextBlock TextWrapping="Wrap"  HorizontalAlignment="Stretch" TextAlignment="Justify" Padding="0" Foreground="Red">
-      <LineBreak />
-      <Bold>IT WILL NOT BE STORED OUTSIDE OF THIS DOWNLOADING SESSION</Bold>
-    </TextBlock>
-  </StackPanel>	
-</UserControl>
diff --git a/src/SIM.Tool.Windows/UserControls/Download8/Login.xaml.cs b/src/SIM.Tool.Windows/UserControls/Download8/Login.xaml.cs
deleted file mode 100644
index 784815be..00000000
--- a/src/SIM.Tool.Windows/UserControls/Download8/Login.xaml.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-namespace SIM.Tool.Windows.UserControls.Download8
-{
-  using System;
-  using System.IO;
-  using System.Linq;
-  using System.Net;
-  using System.Windows;
-  using Alienlab.NetExtensions;
-  using SIM.Extensions;
-  using SIM.Tool.Base;
-  using SIM.Tool.Base.Wizards;
-
-  public partial class Login : IWizardStep, IFlowControl
-  {
-    #region Constructors
-
-    public Login(string param)
-    {
-      InitializeComponent();
-      TextBlock.Text = param;
-    }
-
-    #endregion
-
-    #region IFlowControl Members
-
-    private static string GetMarketplaceCookie(string username, string password)
-    {
-      const string BaseUri = "https://dev.sitecore.net";
-      var request = FormHelper.CreatePostRequest(new Uri(BaseUri + @"/api/authorization"));
-      request.ContentType = @"application/json;charset=UTF-8";
-      var cookies = new CookieContainer();
-      request.CookieContainer = cookies;
-      var content = "{" + $"\"username\":\"{username}\",\"password\":\"{password}\"" + "}";
-      request.ContentLength = content.Length;
-      using (var inputStream = request.GetRequestStream())
-      {
-        using (var writer = new StreamWriter(inputStream))
-        {
-          writer.Write(content);
-        }
-      }
-
-      using (var response = (HttpWebResponse)request.GetResponse())
-      {
-        using (var responseStream = response.GetResponseStream())
-        {
-          using (var streamReader = new StreamReader(responseStream))
-          {
-            if (streamReader.ReadToEnd() == "true")
-            {
-              var sitecoreNetCookies = cookies.GetCookies(new Uri("http://sitecore.net"));
-              var marketplaceCookie = sitecoreNetCookies["marketplace_login"];
-              if (marketplaceCookie == null)
-              {
-                throw new InvalidOperationException("The username or password or both are incorrect, or an unexpected error happen");
-              }
-
-              return marketplaceCookie + "; " + GetSessionCookie(BaseUri);
-            }
-          }
-        }
-      }
-
-
-      throw new InvalidOperationException("The username or password or both are incorrect, or an unexpected error happen");
-    }
-
-    private static string GetSessionCookie(string url)
-    {
-      var request = FormHelper.CreateRequest(new Uri(url));
-      var cookies = new CookieContainer();
-      request.CookieContainer = cookies;
-
-      using (request.GetResponse())
-      {
-        return cookies.GetCookies(new Uri("http://dev.sitecore.net"))["ASP.NET_SessionId"].ToString();
-      }
-    }
-
-
-    bool IFlowControl.OnMovingBack(WizardArgs wizardArgs)
-    {
-      return true;
-    }
-
-    bool IFlowControl.OnMovingNext(WizardArgs wizardArgs)
-    {
-      var args = (DownloadWizardArgs)wizardArgs;
-      if (!string.IsNullOrEmpty(args.Cookies) && UserName.Text.EqualsIgnoreCase(args.UserName) && Passowrd.Password.EqualsIgnoreCase(args.Password) && args.Releases.Length > 0)
-      {
-        return true;
-      }
-
-      var username = args.UserName;
-      var password = args.Password;
-      if (string.IsNullOrEmpty(username))
-      {
-        WindowHelper.HandleError("The provided username is empty", false);
-        return false;
-      }
-
-      if (!username.Contains('@'))
-      {
-        WindowHelper.HandleError("The provided username is not an email", false);
-        return false;
-      }
-
-      if (string.IsNullOrEmpty(password))
-      {
-        WindowHelper.HandleError("The provided password is empty", false);
-        return false;
-      }
-
-      var cookies = string.Empty;
-      WindowHelper.LongRunningTask(
-        () => cookies = GetMarketplaceCookie(username, password), 
-        "Download Sitecore Wizard", 
-        Window.GetWindow(this), 
-        "Authenticating");
-
-      if (string.IsNullOrEmpty(cookies))
-      {
-        return false;
-      }
-
-      args.Cookies = cookies;
-      return true;
-    }
-
-    #endregion
-
-    #region IWizardStep Members
-
-    void IWizardStep.InitializeStep(WizardArgs wizardArgs)
-    {
-      var args = (DownloadWizardArgs)wizardArgs;
-      UserName.Text = args.UserName;
-      Passowrd.Password = args.Password;
-    }
-
-    bool IWizardStep.SaveChanges(WizardArgs wizardArgs)
-    {
-      var username = UserName.Text.Trim();
-
-      var password = Passowrd.Password;
-
-      var args = (DownloadWizardArgs)wizardArgs;
-      args.UserName = username;
-      args.Password = password;
-
-      return true;
-    }
-
-    #endregion
-  }
-}
\ No newline at end of file
diff --git a/src/SIM.Tool.Windows/UserControls/Install/Instance9Validation.xaml.cs b/src/SIM.Tool.Windows/UserControls/Install/Instance9Validation.xaml.cs
index dfba1569..8fb51666 100644
--- a/src/SIM.Tool.Windows/UserControls/Install/Instance9Validation.xaml.cs
+++ b/src/SIM.Tool.Windows/UserControls/Install/Instance9Validation.xaml.cs
@@ -34,6 +34,8 @@ public void InitializeStep(WizardArgs wizardArgs)
       Install9WizardArgs args = (Install9WizardArgs)wizardArgs;
       this.owner = args.WizardWindow;
       this.tasker = args.Tasker;
+      this.Caption.Text = "Validation in progress.";
+      this.Stats.Visibility = Visibility.Hidden;
       if (args.Validate)
       {
         TaskDialogResult result= WindowHelper.LongRunningTask(() => this.RunValidation(), "Running validation", owner);
diff --git a/src/SIM.Tool.Windows/UserControls/SitecoreAuthentication/SitecoreIdServerAuth.cs b/src/SIM.Tool.Windows/UserControls/SitecoreAuthentication/SitecoreIdServerAuth.cs
new file mode 100644
index 00000000..d54a9944
--- /dev/null
+++ b/src/SIM.Tool.Windows/UserControls/SitecoreAuthentication/SitecoreIdServerAuth.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Sitecore.Diagnostics.Logging;
+
+namespace SIM.Tool.Windows.UserControls.SitecoreAuthentication
+{
+  public static class SitecoreIdServerAuth
+  {
+    public static HttpStatusCode CurrentHttpStatusCode { get; private set; }
+
+    public static async Task<string> GetToken(string idServerUri, string userName, string password)
+    {
+      using (HttpClient authClient = new HttpClient())
+      {
+        authClient.BaseAddress = new Uri(idServerUri);
+        authClient.DefaultRequestHeaders.Accept.Clear();
+        authClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+        var content = new FormUrlEncodedContent(new[]
+        {
+          new KeyValuePair<string, string>("client_id", "SitecorePassword"),
+          new KeyValuePair<string, string>("client_secret", "SIF-Default"),
+          new KeyValuePair<string, string>("grant_type", "password"),
+          new KeyValuePair<string, string>("username", userName),
+          new KeyValuePair<string, string>("password", password)
+        });
+
+        try
+        {
+          var response = await authClient.PostAsync("connect/token", content);
+          CurrentHttpStatusCode = response.StatusCode;
+          if (response.IsSuccessStatusCode)
+          {
+            var result = JsonConvert.DeserializeObject<TokenResponse>(response.Content.ReadAsStringAsync().Result);
+            if (!string.IsNullOrEmpty(result.access_token))
+            {
+              return $"Bearer {result.access_token}";
+            }
+            CurrentHttpStatusCode = HttpStatusCode.NoContent;
+          }
+        }
+        catch (OperationCanceledException ex)
+        {
+          Log.Error(ex, ex.Message);
+          CurrentHttpStatusCode = HttpStatusCode.RequestTimeout;
+        }
+        catch (Exception ex)
+        {
+          Log.Error(ex, ex.Message);
+          CurrentHttpStatusCode = HttpStatusCode.InternalServerError;
+        }
+
+        return null;
+      }
+    }
+
+    private struct TokenResponse
+    {
+      public string access_token { get; set; }
+
+      public long expires_in { get; set; }
+
+      public string token_type { get; set; }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/SIM.Tool.Windows/UserControls/SitecoreAuthentication/SitecoreServicesClientAuth.cs b/src/SIM.Tool.Windows/UserControls/SitecoreAuthentication/SitecoreServicesClientAuth.cs
new file mode 100644
index 00000000..214d90eb
--- /dev/null
+++ b/src/SIM.Tool.Windows/UserControls/SitecoreAuthentication/SitecoreServicesClientAuth.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using Sitecore.Diagnostics.Logging;
+
+namespace SIM.Tool.Windows.UserControls.SitecoreAuthentication
+{
+  public static class SitecoreServicesClientAuth
+  {
+    public static HttpStatusCode CurrentHttpStatusCode { get; private set; }
+
+    public static async Task<string> GetCookie(string idServerUri, string userName, string password)
+    {
+      CookieContainer cookieContainer = new CookieContainer();
+      HttpClientHandler httpClientHandler = new HttpClientHandler
+      {
+        CookieContainer = cookieContainer,
+        UseCookies = true
+      };
+
+      using (HttpClient authClient = new HttpClient(httpClientHandler))
+      {
+        Uri uri = new Uri(idServerUri + "/sitecore/api/ssc/auth/login");
+
+        authClient.BaseAddress = uri;
+        authClient.DefaultRequestHeaders.Accept.Clear();
+        authClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+        GetDomainAndName(userName, out string domain, out string name);
+
+        FormUrlEncodedContent content = new FormUrlEncodedContent(new[]
+        {
+          new KeyValuePair<string, string>("domain", domain),
+          new KeyValuePair<string, string>("username", name),
+          new KeyValuePair<string, string>("password", password)
+        });
+
+        try
+        {
+          var response = await authClient.PostAsync(uri, content);
+          Cookie authCookie = cookieContainer.GetCookies(uri).Cast<Cookie>().FirstOrDefault(x => x.Name == ".ASPXAUTH");
+          CurrentHttpStatusCode = response.StatusCode;
+          if (response.IsSuccessStatusCode)
+          {
+            return authCookie?.ToString();
+          }
+        }
+        catch (OperationCanceledException ex)
+        {
+          Log.Error(ex, ex.Message);
+          CurrentHttpStatusCode = HttpStatusCode.RequestTimeout;
+        }
+        catch (Exception ex)
+        {
+          Log.Error(ex, ex.Message);
+          CurrentHttpStatusCode = HttpStatusCode.InternalServerError;
+        }
+
+        return null;
+      }
+    }
+
+    private static void GetDomainAndName(string userName, out string domain, out string username)
+    {
+      domain = null;
+      username = null;
+      if (!string.IsNullOrEmpty(userName))
+      {
+        int charLocation = userName.IndexOf("\\", StringComparison.InvariantCultureIgnoreCase);
+
+        if (charLocation > 0)
+        {
+          domain = userName.Substring(0, charLocation);
+          username = userName.Substring(charLocation + 1);
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/SIM.Tool.Windows/WizardPipelinesConfig.cs b/src/SIM.Tool.Windows/WizardPipelinesConfig.cs
index 52f0e92f..ed99d791 100644
--- a/src/SIM.Tool.Windows/WizardPipelinesConfig.cs
+++ b/src/SIM.Tool.Windows/WizardPipelinesConfig.cs
@@ -179,9 +179,6 @@ Sitecore License Agreement
 By clicking 'Next' you accept the License Agreement."" />
         <step name=""Choose versions to download""
               type=""SIM.Tool.Windows.UserControls.Download8.Downloads, SIM.Tool.Windows"" />
-        <step name=""Provide your dev.sitecore.net credentials""
-              type=""SIM.Tool.Windows.UserControls.Download8.Login, SIM.Tool.Windows""
-              param=""The following credentials will be used for authenticating in dev.sitecore.net and performing downloading selected Sitecore versions on behalf of you. "" />
       </steps>
     </download8>
 
diff --git a/src/SIM.Tool/ButtonsConfiguration/ButtonsConfiguration.json b/src/SIM.Tool/ButtonsConfiguration/ButtonsConfiguration.json
index cb372fef..58f3199d 100644
--- a/src/SIM.Tool/ButtonsConfiguration/ButtonsConfiguration.json
+++ b/src/SIM.Tool/ButtonsConfiguration/ButtonsConfiguration.json
@@ -94,6 +94,7 @@
     "ManagedArgsTracerButton"
   ],
   "Sitecore9AndLaterButtons": [
+    "InstallModulesForSitecore9AndLaterButton",
     "RefreshButton",
     "InstallInstanceButton",
     "Install9InstanceButton",
@@ -172,6 +173,7 @@
     "BackupGroup"
   ],
   "Sitecore9AndLaterGroups": [
+    "InstallGroup",
     "PageGroup",
     "FileSystemGroup",
     "AppsGroup",