diff --git a/login/Change_PW.aspx.vb b/login/Change_PW.aspx.vb
index 9d9c3bd..a0ffc9f 100644
--- a/login/Change_PW.aspx.vb
+++ b/login/Change_PW.aspx.vb
@@ -160,7 +160,7 @@ Partial Class login_Change_PW
                         Dim dr As SqlDataReader = cmd.ExecuteReader()
                         If dr.HasRows Then
                             dr.Read()
-                            If String.Equals(txt_Pw.Text, dr("Password").ToString) = False Or String.Equals(txt_Pw_WH.Text, dr("Password").ToString) = False Then
+                            If String.Equals(txt_Pw_WH.Text, dr("Password").ToString) = False Then
                                 tempstr = txt_Pw.Text
                             Else
                                 lbl_messagetext.Text = "Die gewählten Passwörter dürfen nicht dem alten entsprechen!"
@@ -190,7 +190,7 @@ Partial Class login_Change_PW
             reqPasswtxt.Validate()
             If reqPasswtxt.IsValid = True Then
                 txt_Pw_WH.Enabled = True
-                reqPassw1txt.Validate()
+                regexval_txt_Pw.Validate()
             End If
 
             Try
@@ -204,7 +204,7 @@ Partial Class login_Change_PW
                     ConnectionString = "Server=DEVELOPER.verag.ost.dmn\DEVSQL;Database=VERAG_HOMEPAGE;Uid=AppUser;Pwd=yp/THDd?xM+pZ$;"
                     'ConnectionString = "Server=db593295684.db.1and1.com;Database=db593295684;Uid=dbo593295684;Pwd=atilla#2;"
                 End If
-                If reqPassw1txt_M.IsValid = True Then
+                If regexval_txt_Pw.IsValid = True Then
                     If String.Equals(txt_Pw_WH.Text, tempstr) = True AndAlso String.Equals(txt_Pw.Text, tempstr) = True AndAlso String.IsNullOrEmpty(txt_Pw_M.Text) = True And String.IsNullOrEmpty(txt_Pw_WH_M.Text) = True And String.Equals(tempstr, "Error01") = False Then
                         Using con As New SqlConnection(ConnectionString)
 
@@ -328,36 +328,40 @@ Partial Class login_Change_PW
                     ConnectionString = "Server=DEVELOPER.verag.ost.dmn\DEVSQL;Database=VERAG_HOMEPAGE;Uid=AppUser;Pwd=yp/THDd?xM+pZ$;"
                     'ConnectionString = "Server=db593295684.db.1and1.com;Database=db593295684;Uid=dbo593295684;Pwd=atilla#2;"
                 End If
-                Using con As New SqlConnection(ConnectionString)
-                    ' Using cmd As New SqlCommand("Validate_User")
-                    Using cmd As New SqlCommand("SELECT UserId,Username,Password FROM [VERAG_HOMEPAGE].[dbo].[Users] WHERE Username=@Username AND UserId=@UserId And UserId=@UserId")
-                        ' cmd.CommandType = CommandType.StoredProcedure
-                        Dim usrname As String = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par2")).ToString
-                        Dim UsrID As String = VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(Request.QueryString("Par3")).ToString
-                        Dim THEUsrID As String = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par4")).ToString
-                        cmd.Parameters.AddWithValue("@Username", usrname)
-                        cmd.Parameters.AddWithValue("@UserId", UsrID)
-                        cmd.Connection = con
-                        con.Open()
-                        ' userId = Convert.ToInt32(cmd.ExecuteScalar())
-                        Dim dr As SqlDataReader = cmd.ExecuteReader()
-                        If dr.HasRows Then
-                            dr.Read()
-                            If String.Equals(txt_Pw_M.Text, dr("Password").ToString, StringComparison.CurrentCulture) = False Or String.Equals(txt_Pw_WH_M.Text, dr("Password").ToString, StringComparison.CurrentCulture) = False Then
-                                tempstr = txt_Pw_M.Text
-                            Else
-                                lbl_messagetext_M.ForeColor = Drawing.Color.Red
-                                lbl_messagetext_M.Text = "Die gewählten Passwörter dürfen nicht dem alten entsprechen!"
+                If regexval_txt_Pw_WH.IsValid Then
+                    Using con As New SqlConnection(ConnectionString)
+                        ' Using cmd As New SqlCommand("Validate_User")
+                        Using cmd As New SqlCommand("SELECT UserId,Username,Password FROM [VERAG_HOMEPAGE].[dbo].[Users] WHERE Username=@Username AND UserId=@UserId And UserId=@UserId")
+                            ' cmd.CommandType = CommandType.StoredProcedure
+                            Dim usrname As String = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par2")).ToString
+                            Dim UsrID As String = VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(Request.QueryString("Par3")).ToString
+                            Dim THEUsrID As String = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par4")).ToString
+                            cmd.Parameters.AddWithValue("@Username", usrname)
+                            cmd.Parameters.AddWithValue("@UserId", UsrID)
+                            cmd.Connection = con
+                            con.Open()
+                            ' userId = Convert.ToInt32(cmd.ExecuteScalar())
+                            Dim dr As SqlDataReader = cmd.ExecuteReader()
+                            If dr.HasRows Then
+                                dr.Read()
+                                If String.Equals(txt_Pw_M.Text, dr("Password").ToString, StringComparison.CurrentCulture) = False Or String.Equals(txt_Pw_WH_M.Text, dr("Password").ToString, StringComparison.CurrentCulture) = False Then
+                                    tempstr = txt_Pw_M.Text
+                                Else
+                                    lbl_messagetext_M.ForeColor = Drawing.Color.Red
+                                    lbl_messagetext_M.Text = "Die gewählten Passwörter dürfen nicht dem alten entsprechen!"
+                                End If
                             End If
-                        End If
-                        dr.Close()
+                            dr.Close()
+                        End Using
+                        con.Close()
                     End Using
-                    con.Close()
-                End Using
+                Else
+                    tempstr = "Error2"
+                End If
             Else
-                tempstr = "Error01"
+                    tempstr = "Error01"
             End If
-            If String.Equals(txt_Pw_WH_M.Text, tempstr) = True AndAlso String.Equals(txt_Pw_M.Text, tempstr) = True AndAlso String.IsNullOrEmpty(txt_Pw.Text) = True And String.IsNullOrEmpty(txt_Pw_WH.Text) = True And String.Equals(tempstr, "Error01") = False Then
+            If String.Equals(txt_Pw_WH_M.Text, tempstr) = True AndAlso String.Equals(txt_Pw_M.Text, tempstr) = True AndAlso String.IsNullOrEmpty(txt_Pw.Text) = True And String.IsNullOrEmpty(txt_Pw_WH.Text) = True And String.Equals(tempstr, "Error01") = False And String.Equals(tempstr, "Error02") = False Then
                 Try
                     ConnectionString = ""
                     Dim usrname As String = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par2")).ToString