diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/OrganizationPasswordPolicyAttribute.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/OrganizationPasswordPolicyAttribute.cs
index 6fea16be..9cffde91 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/OrganizationPasswordPolicyAttribute.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/CustomAttributes/OrganizationPasswordPolicyAttribute.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Web;
 using System.Web.Mvc;
 using WebsitePanel.Providers.HostedSolution;
@@ -53,9 +54,9 @@ namespace WebsitePanel.WebDavPortal.CustomAttributes
 
                     if (settings.PasswordComplexityEnabled)
                     {
-                        var symbolsCount = valueString.Count(Char.IsSymbol);
                         var numbersCount = valueString.Count(Char.IsDigit);
                         var upperLetterCount = valueString.Count(Char.IsUpper);
+                        var symbolsCount = Regex.Matches(valueString, @"[~!@#$%^&*_\-+'\|\\(){}\[\]:;\""'<>,.?/]").Count;
 
                         if (upperLetterCount < settings.UppercaseLettersCount)
                         {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/validation/passwordeditor.unobtrusive.js b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/validation/passwordeditor.unobtrusive.js
index 799b8f82..03d49e3e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/validation/passwordeditor.unobtrusive.js
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Scripts/appScripts/validation/passwordeditor.unobtrusive.js
@@ -45,7 +45,7 @@ $.validator.addMethod("numberscount", function (value, element, count) {
 $.validator.unobtrusive.adapters.addSingleVal("symbolscount", "count");
 
 $.validator.addMethod("symbolscount", function (value, element, count) {
-    if (value.replace(/[a-zA-Z0-9_]/g, "").length < count) {
+    if (value.replace(/[^~!@#$%^&*_\-+'\|\\(){}\[\]:;\"'<>,.?/]/g, "").length < count) {
         
         return false;
     }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetFinalStep.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetFinalStep.cshtml
index 6432a19b..2d5abbbf 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetFinalStep.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/PasswordResetFinalStep.cshtml
@@ -8,7 +8,8 @@
 <div class="container row">
     @using (Html.BeginRouteForm(AccountRouteNames.PasswordResetFinalStep, FormMethod.Post, new { @class = "form-horizontal user-password-reset-final-step bs-val-styles col-lg-9 col-lg-offset-3", id = "user-password-reset" }))
     {
-
+        @Html.HiddenFor(x=>x.Login)
+        
         <div class="form-group">
             <h3>@UI.PasswordReset</h3>
         </div>