diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/StandaloneServerActionManager.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/StandaloneServerActionManager.cs
index 60b02246..b1cdb349 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/StandaloneServerActionManager.cs
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/StandaloneServerActionManager.cs
@@ -651,12 +651,11 @@ namespace WebsitePanel.Setup.Actions
 				user.IsPeer = false;
 				user.HtmlMail = true;
 				user.Username = loginName;
-				user.Password = password;
 				user.FirstName = firstName;
 				user.LastName = lastName;
 				user.Email = email;
 
-				int userId = ES.Services.Users.AddUser(user, false);
+				int userId = ES.Services.Users.AddUser(user, false, password);
 				if (userId > 0)
 				{
 					Log.WriteEnd("Added user account");
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Internal/Adapter.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Internal/Adapter.cs
index 5eeb3a0c..ea1913ec 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Internal/Adapter.cs
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Internal/Adapter.cs
@@ -1720,12 +1720,11 @@ namespace WebsitePanel.Setup.Internal
                 user.IsPeer = false;
                 user.HtmlMail = true;
                 user.Username = loginName;
-                user.Password = password;
                 user.FirstName = firstName;
                 user.LastName = lastName;
                 user.Email = email;
 
-                int userId = ES.Services.Users.AddUser(user, false);
+                int userId = ES.Services.Users.AddUser(user, false, password);
                 if (userId > 0)
                 {
                     Log.WriteEnd("Added user account");
diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ExpressInstallPage.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ExpressInstallPage.cs
index 82062a32..29056db1 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ExpressInstallPage.cs
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ExpressInstallPage.cs
@@ -1153,12 +1153,11 @@ namespace WebsitePanel.Setup
 				user.IsPeer = false;
 				user.HtmlMail = true;
 				user.Username = loginName;
-				user.Password = password;
 				user.FirstName = firstName;
 				user.LastName = lastName;
 				user.Email = email;
 
-				int userId = ES.Services.Users.AddUser(user, false);
+				int userId = ES.Services.Users.AddUser(user, false, password);
 				if (userId > 0)
 				{
 					Log.WriteEnd("Added user account");