From 105cc037c3d51b90d267b21524c0de199eb7ca86 Mon Sep 17 00:00:00 2001
From: Thomas Weyermann <thomas.weyermann@inovit.ch>
Date: Mon, 8 May 2023 16:28:57 +0200
Subject: [PATCH] add pwd reset support for ASCII codes 224 - 252

---
 .../LocalAccounts/TrustFrameworkBase.xml      | 14 ++++++------
 .../TrustFrameworkBase.xml                    | 14 ++++++------
 .../TrustFrameworkBase.xml                    | 14 ++++++------
 LocalAccounts/TrustFrameworkBase.xml          | 14 ++++++------
 SocialAndLocalAccounts/TrustFrameworkBase.xml | 14 ++++++------
 .../TrustFrameworkBase.xml                    | 14 ++++++------
 .../Phone_Email_Base.xml                      | 22 +++++++++++++++++--
 7 files changed, 62 insertions(+), 44 deletions(-)

diff --git a/Display Controls Starterpack/LocalAccounts/TrustFrameworkBase.xml b/Display Controls Starterpack/LocalAccounts/TrustFrameworkBase.xml
index fbc4756..ea75b4d 100644
--- a/Display Controls Starterpack/LocalAccounts/TrustFrameworkBase.xml	
+++ b/Display Controls Starterpack/LocalAccounts/TrustFrameworkBase.xml	
@@ -96,19 +96,19 @@
         <UserHelpText>Enter new password</UserHelpText>
         <UserInputType>Password</UserInputType>
         <Restriction>
-          <Pattern RegularExpression="^((?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]))([A-Za-z\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText="8-16 characters, containing 3 out of 4 of the following: Lowercase characters, uppercase characters, digits (0-9), and one or more of the following symbols: @ # $ % ^ &amp; * - _ + = [ ] { } | \ : ' , ? / ` ~ &quot; ( ) ; ." />
+          <Pattern RegularExpression="^((?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d)|(?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9])|(?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])|(?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]))([A-ZÀ-Üa-zà-ü\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText="8-16 characters, containing 3 out of 4 of the following: Lowercase characters, uppercase characters, digits (0-9), and one or more of the following symbols: @ # $ % ^ &amp; * - _ + = [ ] { } | \ : ' , ? / ` ~ &quot; ( ) ; ." />
         </Restriction>
       </ClaimType>
       <!-- The password regular expression above is constructed for AAD passwords based on restrictions at https://msdn.microsoft.com/en-us/library/azure/jj943764.aspx
 
         ^( # one of the following four combinations must appear in the password
-         (?=.*[a-z])(?=.*[A-Z])(?=.*\d) |            # matches lower case, upper case or digit
-         (?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9]) |  # matches lower case, upper case or special character (i.e. non-alpha or digit)
-         (?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9]) |     # matches lower case, digit, or special character
-         (?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9])       # matches upper case, digit, or special character
+         (?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d) |            # matches lower case, upper case or digit
+         (?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9]) |  # matches lower case, upper case or special character (i.e. non-alpha or digit)
+         (?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]) |     # matches lower case, digit, or special character
+         (?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])       # matches upper case, digit, or special character
         )
         ( # The password must match the following restrictions
-         [A-Za-z\d@#$%^&*\-_+=[\]{}|\\:',?/`~"();!] |   # The list of all acceptable characters (without .)
+         [A-ZÀ-Üa-zà-ü\d@#$%^&*\-_+=[\]{}|\\:',?/`~"();!] |   # The list of all acceptable characters (without .)
          \.(?!@)                                        # or . can appear as long as not followed by @
         ) {8,16}$                                       # the length must be between 8 and 16 chars inclusive
 
@@ -120,7 +120,7 @@
         <UserHelpText>Confirm new password</UserHelpText>
         <UserInputType>Password</UserInputType>
         <Restriction>
-          <Pattern RegularExpression="^((?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]))([A-Za-z\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText=" " />
+          <Pattern RegularExpression="^((?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d)|(?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9])|(?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])|(?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]))([A-ZÀ-Üa-zà-ü\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText=" " />
         </Restriction>
       </ClaimType>
 
diff --git a/Display Controls Starterpack/SocialAndLocalAccounts/TrustFrameworkBase.xml b/Display Controls Starterpack/SocialAndLocalAccounts/TrustFrameworkBase.xml
index 6b9334c..194a112 100644
--- a/Display Controls Starterpack/SocialAndLocalAccounts/TrustFrameworkBase.xml	
+++ b/Display Controls Starterpack/SocialAndLocalAccounts/TrustFrameworkBase.xml	
@@ -97,19 +97,19 @@
         <UserHelpText>Enter new password</UserHelpText>
         <UserInputType>Password</UserInputType>
         <Restriction>
-          <Pattern RegularExpression="^((?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]))([A-Za-z\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText="8-16 characters, containing 3 out of 4 of the following: Lowercase characters, uppercase characters, digits (0-9), and one or more of the following symbols: @ # $ % ^ &amp; * - _ + = [ ] { } | \ : ' , ? / ` ~ &quot; ( ) ; ." />
+          <Pattern RegularExpression="^((?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d)|(?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9])|(?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])|(?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]))([A-ZÀ-Üa-zà-ü\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText="8-16 characters, containing 3 out of 4 of the following: Lowercase characters, uppercase characters, digits (0-9), and one or more of the following symbols: @ # $ % ^ &amp; * - _ + = [ ] { } | \ : ' , ? / ` ~ &quot; ( ) ; ." />
         </Restriction>
       </ClaimType>
       <!-- The password regular expression above is constructed for AAD passwords based on restrictions at https://msdn.microsoft.com/en-us/library/azure/jj943764.aspx
 
         ^( # one of the following four combinations must appear in the password
-         (?=.*[a-z])(?=.*[A-Z])(?=.*\d) |            # matches lower case, upper case or digit
-         (?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9]) |  # matches lower case, upper case or special character (i.e. non-alpha or digit)
-         (?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9]) |     # matches lower case, digit, or special character
-         (?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9])       # matches upper case, digit, or special character
+         (?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d) |            # matches lower case, upper case or digit
+         (?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9]) |  # matches lower case, upper case or special character (i.e. non-alpha or digit)
+         (?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]) |     # matches lower case, digit, or special character
+         (?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])       # matches upper case, digit, or special character
         )
         ( # The password must match the following restrictions
-         [A-Za-z\d@#$%^&*\-_+=[\]{}|\\:',?/`~"();!] |   # The list of all acceptable characters (without .)
+         [A-ZÀ-Üa-zà-ü\d@#$%^&*\-_+=[\]{}|\\:',?/`~"();!] |   # The list of all acceptable characters (without .)
          \.(?!@)                                        # or . can appear as long as not followed by @
         ) {8,16}$                                       # the length must be between 8 and 16 chars inclusive
 
@@ -121,7 +121,7 @@
         <UserHelpText>Confirm new password</UserHelpText>
         <UserInputType>Password</UserInputType>
         <Restriction>
-          <Pattern RegularExpression="^((?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]))([A-Za-z\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText=" " />
+          <Pattern RegularExpression="^((?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d)|(?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9])|(?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])|(?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]))([A-ZÀ-Üa-zà-ü\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText=" " />
         </Restriction>
       </ClaimType>
 
diff --git a/Display Controls Starterpack/SocialAndLocalAccountsWithMfa/TrustFrameworkBase.xml b/Display Controls Starterpack/SocialAndLocalAccountsWithMfa/TrustFrameworkBase.xml
index cb5b4f2..7d89e11 100644
--- a/Display Controls Starterpack/SocialAndLocalAccountsWithMfa/TrustFrameworkBase.xml	
+++ b/Display Controls Starterpack/SocialAndLocalAccountsWithMfa/TrustFrameworkBase.xml	
@@ -97,19 +97,19 @@
         <UserHelpText>Enter new password</UserHelpText>
         <UserInputType>Password</UserInputType>
         <Restriction>
-          <Pattern RegularExpression="^((?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]))([A-Za-z\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText="8-16 characters, containing 3 out of 4 of the following: Lowercase characters, uppercase characters, digits (0-9), and one or more of the following symbols: @ # $ % ^ &amp; * - _ + = [ ] { } | \ : ' , ? / ` ~ &quot; ( ) ; ." />
+          <Pattern RegularExpression="^((?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d)|(?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9])|(?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])|(?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]))([A-ZÀ-Üa-zà-ü\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText="8-16 characters, containing 3 out of 4 of the following: Lowercase characters, uppercase characters, digits (0-9), and one or more of the following symbols: @ # $ % ^ &amp; * - _ + = [ ] { } | \ : ' , ? / ` ~ &quot; ( ) ; ." />
         </Restriction>
       </ClaimType>
       <!-- The password regular expression above is constructed for AAD passwords based on restrictions at https://msdn.microsoft.com/en-us/library/azure/jj943764.aspx
 
         ^( # one of the following four combinations must appear in the password
-         (?=.*[a-z])(?=.*[A-Z])(?=.*\d) |            # matches lower case, upper case or digit
-         (?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9]) |  # matches lower case, upper case or special character (i.e. non-alpha or digit)
-         (?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9]) |     # matches lower case, digit, or special character
-         (?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9])       # matches upper case, digit, or special character
+         (?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d) |            # matches lower case, upper case or digit
+         (?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9]) |  # matches lower case, upper case or special character (i.e. non-alpha or digit)
+         (?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]) |     # matches lower case, digit, or special character
+         (?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])       # matches upper case, digit, or special character
         )
         ( # The password must match the following restrictions
-         [A-Za-z\d@#$%^&*\-_+=[\]{}|\\:',?/`~"();!] |   # The list of all acceptable characters (without .)
+         [A-ZÀ-Üa-zà-ü\d@#$%^&*\-_+=[\]{}|\\:',?/`~"();!] |   # The list of all acceptable characters (without .)
          \.(?!@)                                        # or . can appear as long as not followed by @
         ) {8,16}$                                       # the length must be between 8 and 16 chars inclusive
 
@@ -121,7 +121,7 @@
         <UserHelpText>Confirm new password</UserHelpText>
         <UserInputType>Password</UserInputType>
         <Restriction>
-          <Pattern RegularExpression="^((?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]))([A-Za-z\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText=" " />
+          <Pattern RegularExpression="^((?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d)|(?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9])|(?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])|(?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]))([A-ZÀ-Üa-zà-ü\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText=" " />
         </Restriction>
       </ClaimType>
 
diff --git a/LocalAccounts/TrustFrameworkBase.xml b/LocalAccounts/TrustFrameworkBase.xml
index 6a61ffb..c016e37 100644
--- a/LocalAccounts/TrustFrameworkBase.xml
+++ b/LocalAccounts/TrustFrameworkBase.xml
@@ -96,19 +96,19 @@
         <UserHelpText>Enter new password</UserHelpText>
         <UserInputType>Password</UserInputType>
         <Restriction>
-          <Pattern RegularExpression="^((?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]))([A-Za-z\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText="8-16 characters, containing 3 out of 4 of the following: Lowercase characters, uppercase characters, digits (0-9), and one or more of the following symbols: @ # $ % ^ &amp; * - _ + = [ ] { } | \ : ' , ? / ` ~ &quot; ( ) ; ." />
+          <Pattern RegularExpression="^((?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d)|(?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9])|(?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])|(?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]))([A-ZÀ-Üa-zà-ü\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText="8-16 characters, containing 3 out of 4 of the following: Lowercase characters, uppercase characters, digits (0-9), and one or more of the following symbols: @ # $ % ^ &amp; * - _ + = [ ] { } | \ : ' , ? / ` ~ &quot; ( ) ; ." />
         </Restriction>
       </ClaimType>
       <!-- The password regular expression above is constructed for AAD passwords based on restrictions at https://msdn.microsoft.com/en-us/library/azure/jj943764.aspx
 
         ^( # one of the following four combinations must appear in the password
-         (?=.*[a-z])(?=.*[A-Z])(?=.*\d) |            # matches lower case, upper case or digit
-         (?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9]) |  # matches lower case, upper case or special character (i.e. non-alpha or digit)
-         (?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9]) |     # matches lower case, digit, or special character
-         (?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9])       # matches upper case, digit, or special character
+         (?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d) |            # matches lower case, upper case or digit
+         (?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9]) |  # matches lower case, upper case or special character (i.e. non-alpha or digit)
+         (?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]) |     # matches lower case, digit, or special character
+         (?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])       # matches upper case, digit, or special character
         )
         ( # The password must match the following restrictions
-         [A-Za-z\d@#$%^&*\-_+=[\]{}|\\:',?/`~"();!] |   # The list of all acceptable characters (without .)
+         [A-ZÀ-Üa-zà-ü\d@#$%^&*\-_+=[\]{}|\\:',?/`~"();!] |   # The list of all acceptable characters (without .)
          \.(?!@)                                        # or . can appear as long as not followed by @
         ) {8,16}$                                       # the length must be between 8 and 16 chars inclusive
 
@@ -120,7 +120,7 @@
         <UserHelpText>Confirm new password</UserHelpText>
         <UserInputType>Password</UserInputType>
         <Restriction>
-          <Pattern RegularExpression="^((?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]))([A-Za-z\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText=" " />
+          <Pattern RegularExpression="^((?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d)|(?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9])|(?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])|(?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]))([A-ZÀ-Üa-zà-ü\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText=" " />
         </Restriction>
       </ClaimType>
 
diff --git a/SocialAndLocalAccounts/TrustFrameworkBase.xml b/SocialAndLocalAccounts/TrustFrameworkBase.xml
index 7ebedf9..fee7845 100644
--- a/SocialAndLocalAccounts/TrustFrameworkBase.xml
+++ b/SocialAndLocalAccounts/TrustFrameworkBase.xml
@@ -97,19 +97,19 @@
         <UserHelpText>Enter new password</UserHelpText>
         <UserInputType>Password</UserInputType>
         <Restriction>
-          <Pattern RegularExpression="^((?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]))([A-Za-z\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText="8-16 characters, containing 3 out of 4 of the following: Lowercase characters, uppercase characters, digits (0-9), and one or more of the following symbols: @ # $ % ^ &amp; * - _ + = [ ] { } | \ : ' , ? / ` ~ &quot; ( ) ; ." />
+          <Pattern RegularExpression="^((?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d)|(?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9])|(?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])|(?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]))([A-ZÀ-Üa-zà-ü\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText="8-16 characters, containing 3 out of 4 of the following: Lowercase characters, uppercase characters, digits (0-9), and one or more of the following symbols: @ # $ % ^ &amp; * - _ + = [ ] { } | \ : ' , ? / ` ~ &quot; ( ) ; ." />
         </Restriction>
       </ClaimType>
       <!-- The password regular expression above is constructed for AAD passwords based on restrictions at https://msdn.microsoft.com/en-us/library/azure/jj943764.aspx
 
         ^( # one of the following four combinations must appear in the password
-         (?=.*[a-z])(?=.*[A-Z])(?=.*\d) |            # matches lower case, upper case or digit
-         (?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9]) |  # matches lower case, upper case or special character (i.e. non-alpha or digit)
-         (?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9]) |     # matches lower case, digit, or special character
-         (?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9])       # matches upper case, digit, or special character
+         (?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d) |            # matches lower case, upper case or digit
+         (?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9]) |  # matches lower case, upper case or special character (i.e. non-alpha or digit)
+         (?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]) |     # matches lower case, digit, or special character
+         (?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])       # matches upper case, digit, or special character
         )
         ( # The password must match the following restrictions
-         [A-Za-z\d@#$%^&*\-_+=[\]{}|\\:',?/`~"();!] |   # The list of all acceptable characters (without .)
+         [A-ZÀ-Üa-zà-ü\d@#$%^&*\-_+=[\]{}|\\:',?/`~"();!] |   # The list of all acceptable characters (without .)
          \.(?!@)                                        # or . can appear as long as not followed by @
         ) {8,16}$                                       # the length must be between 8 and 16 chars inclusive
 
@@ -121,7 +121,7 @@
         <UserHelpText>Confirm new password</UserHelpText>
         <UserInputType>Password</UserInputType>
         <Restriction>
-          <Pattern RegularExpression="^((?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]))([A-Za-z\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText=" " />
+          <Pattern RegularExpression="^((?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d)|(?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9])|(?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])|(?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]))([A-ZÀ-Üa-zà-ü\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText=" " />
         </Restriction>
       </ClaimType>
 
diff --git a/SocialAndLocalAccountsWithMfa/TrustFrameworkBase.xml b/SocialAndLocalAccountsWithMfa/TrustFrameworkBase.xml
index d3e26c8..7a5710b 100644
--- a/SocialAndLocalAccountsWithMfa/TrustFrameworkBase.xml
+++ b/SocialAndLocalAccountsWithMfa/TrustFrameworkBase.xml
@@ -97,19 +97,19 @@
         <UserHelpText>Enter new password</UserHelpText>
         <UserInputType>Password</UserInputType>
         <Restriction>
-          <Pattern RegularExpression="^((?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]))([A-Za-z\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText="8-16 characters, containing 3 out of 4 of the following: Lowercase characters, uppercase characters, digits (0-9), and one or more of the following symbols: @ # $ % ^ &amp; * - _ + = [ ] { } | \ : ' , ? / ` ~ &quot; ( ) ; ." />
+          <Pattern RegularExpression="^((?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d)|(?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9])|(?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])|(?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]))([A-ZÀ-Üa-zà-ü\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText="8-16 characters, containing 3 out of 4 of the following: Lowercase characters, uppercase characters, digits (0-9), and one or more of the following symbols: @ # $ % ^ &amp; * - _ + = [ ] { } | \ : ' , ? / ` ~ &quot; ( ) ; ." />
         </Restriction>
       </ClaimType>
       <!-- The password regular expression above is constructed for AAD passwords based on restrictions at https://msdn.microsoft.com/en-us/library/azure/jj943764.aspx
 
         ^( # one of the following four combinations must appear in the password
-         (?=.*[a-z])(?=.*[A-Z])(?=.*\d) |            # matches lower case, upper case or digit
-         (?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9]) |  # matches lower case, upper case or special character (i.e. non-alpha or digit)
-         (?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9]) |     # matches lower case, digit, or special character
-         (?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9])       # matches upper case, digit, or special character
+         (?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d) |            # matches lower case, upper case or digit
+         (?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9]) |  # matches lower case, upper case or special character (i.e. non-alpha or digit)
+         (?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]) |     # matches lower case, digit, or special character
+         (?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])       # matches upper case, digit, or special character
         )
         ( # The password must match the following restrictions
-         [A-Za-z\d@#$%^&*\-_+=[\]{}|\\:',?/`~"();!] |   # The list of all acceptable characters (without .)
+         [A-ZÀ-Üa-zà-ü\d@#$%^&*\-_+=[\]{}|\\:',?/`~"();!] |   # The list of all acceptable characters (without .)
          \.(?!@)                                        # or . can appear as long as not followed by @
         ) {8,16}$                                       # the length must be between 8 and 16 chars inclusive
 
@@ -121,7 +121,7 @@
         <UserHelpText>Confirm new password</UserHelpText>
         <UserInputType>Password</UserInputType>
         <Restriction>
-          <Pattern RegularExpression="^((?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]))([A-Za-z\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText=" " />
+          <Pattern RegularExpression="^((?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d)|(?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9])|(?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])|(?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]))([A-ZÀ-Üa-zà-ü\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText=" " />
         </Restriction>
       </ClaimType>
 
diff --git a/scenarios/phone-number-passwordless/Phone_Email_Base.xml b/scenarios/phone-number-passwordless/Phone_Email_Base.xml
index fefc369..dc464c6 100644
--- a/scenarios/phone-number-passwordless/Phone_Email_Base.xml
+++ b/scenarios/phone-number-passwordless/Phone_Email_Base.xml
@@ -334,22 +334,40 @@
         <UserHelpText>Enter password</UserHelpText>
         <UserInputType>Password</UserInputType>
       </ClaimType>
+      <!-- The claim types newPassword and reenterPassword are considered special, please do not change the names. 
+           The UI validates that the user correctly re-entered their password during account creation based on these 
+           claim types.	  -->
       <ClaimType Id="newPassword">
         <DisplayName>New Password</DisplayName>
         <DataType>string</DataType>
         <UserHelpText>Enter new password</UserHelpText>
         <UserInputType>Password</UserInputType>
         <Restriction>
-          <Pattern RegularExpression="^((?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]))([A-Za-z\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText="8-16 characters, containing 3 out of 4 of the following: Lowercase characters, uppercase characters, digits (0-9), and one or more of the following symbols: @ # $ % ^ &amp; * - _ + = [ ] { } | \ : ' , ? / ` ~ &quot; ( ) ; ." />
+          <Pattern RegularExpression="^((?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d)|(?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9])|(?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])|(?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]))([A-ZÀ-Üa-zà-ü\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText="8-16 characters, containing 3 out of 4 of the following: Lowercase characters, uppercase characters, digits (0-9), and one or more of the following symbols: @ # $ % ^ &amp; * - _ + = [ ] { } | \ : ' , ? / ` ~ &quot; ( ) ; ." />
         </Restriction>
       </ClaimType>
+      <!-- The password regular expression above is constructed for AAD passwords based on restrictions at https://msdn.microsoft.com/en-us/library/azure/jj943764.aspx
+
+        ^( # one of the following four combinations must appear in the password
+         (?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d) |            # matches lower case, upper case or digit
+         (?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9]) |  # matches lower case, upper case or special character (i.e. non-alpha or digit)
+         (?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]) |     # matches lower case, digit, or special character
+         (?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])       # matches upper case, digit, or special character
+        )
+        ( # The password must match the following restrictions
+         [A-ZÀ-Üa-zà-ü\d@#$%^&*\-_+=[\]{}|\\:',?/`~"();!] |   # The list of all acceptable characters (without .)
+         \.(?!@)                                        # or . can appear as long as not followed by @
+        ) {8,16}$                                       # the length must be between 8 and 16 chars inclusive
+
+      -->
+
       <ClaimType Id="reenterPassword">
         <DisplayName>Confirm New Password</DisplayName>
         <DataType>string</DataType>
         <UserHelpText>Confirm new password</UserHelpText>
         <UserInputType>Password</UserInputType>
         <Restriction>
-          <Pattern RegularExpression="^((?=.*[a-z])(?=.*[A-Z])(?=.*\d)|(?=.*[a-z])(?=.*[A-Z])(?=.*[^A-Za-z0-9])|(?=.*[a-z])(?=.*\d)(?=.*[^A-Za-z0-9])|(?=.*[A-Z])(?=.*\d)(?=.*[^A-Za-z0-9]))([A-Za-z\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText=" " />
+          <Pattern RegularExpression="^((?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*\d)|(?=.*[a-z]|[à-ü])(?=.*[A-Z]|[À-Ü])(?=.*[^A-Za-z0-9])|(?=.*[a-z]|[à-ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9])|(?=.*[A-Z]|[À-Ü])(?=.*\d)(?=.*[^A-ZÀ-Üa-zà-ü0-9]))([A-ZÀ-Üa-zà-ü\d@#$%^&amp;*\-_+=[\]{}|\\:',?/`~&quot;();!]|\.(?!@)){8,16}$" HelpText=" " />
         </Restriction>
       </ClaimType>
       <ClaimType Id="passwordPolicies">