diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
index 31cee37f2..c5af9b15b 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
@@ -45,6 +45,10 @@ namespace Orchard.Setup.Controllers {
             if (!model.DatabaseOptions && string.IsNullOrEmpty(model.DatabaseConnectionString))
                 ModelState.AddModelError("DatabaseConnectionString", "A SQL connection string is required");
 
+            if (!String.IsNullOrWhiteSpace(model.ConfirmPassword) && model.AdminPassword != model.ConfirmPassword ) {
+                ModelState.AddModelError("ConfirmPassword", T("Password confirmation must match").ToString());
+            }
+
             if (!ModelState.IsValid) {
                 return IndexViewResult(model);
             }
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs b/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs
index 086aebf52..05bc8a8bb 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/ViewModels/SetupViewModel.cs
@@ -14,6 +14,8 @@ namespace Orchard.Setup.ViewModels {
         public string AdminUsername { get; set; }
         [Required(ErrorMessage = "Password is required."), StringLengthMin(6, ErrorMessage = "Password must be longer than 6 characters."), StringLength(50, ErrorMessage = "Password can be no longer than 50 characters.")]
         public string AdminPassword { get; set; }
+        [Required(ErrorMessage = "Password confirmation is required.")]
+        public string ConfirmPassword { get; set; }
         public bool DatabaseOptions { get; set; }
         [SqlDatabaseConnectionString]
         public string DatabaseConnectionString { get; set; }
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
index 7db91a3c0..8f6195891 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.ascx
@@ -18,6 +18,10 @@ using (Html.BeginFormAntiForgeryPost()) { %>
         <label for="AdminPassword"><%: T("Choose a password:") %></label>
         <%: Html.PasswordFor(svm => svm.AdminPassword) %>
     </div>
+    <div>
+        <label for="ConfirmAdminPassword"><%: T("Confirm the password:") %></label>
+        <%: Html.PasswordFor(svm => svm.ConfirmPassword)%>
+    </div>
 </fieldset><%
 if (!Model.DatabaseIsPreconfigured) { %>
 <fieldset class="data">