diff --git a/css/login/Changepw.css b/css/login/Changepw.css
index 77078d0..cd99c72 100644
--- a/css/login/Changepw.css
+++ b/css/login/Changepw.css
@@ -19,6 +19,11 @@
     border-color: forestgreen;
     color: black;
 }
+#txt_Pw:invalid + span::before {
+    content: '✖';
+    color: red;
+}
+
 #txt_Pw:invalid {
     background-color: indianred;
     border-color: red;
@@ -29,6 +34,10 @@
     border-color: forestgreen;
     color: black;
 }
+#txt_Pw:invalid + span::before {
+    content: '✖';
+    color: red;
+}
 #tbl_main {
     font-family: Arial;
     font-size: 11px;
diff --git a/login/ChangePW.aspx b/login/ChangePW.aspx
index f0cd9aa..f223977 100644
--- a/login/ChangePW.aspx
+++ b/login/ChangePW.aspx
@@ -85,6 +85,7 @@
                       <tr style="color:#003680;height:36.67px;">
                         <td colspan="4">
                             <asp:TextBox id="txt_Pw" runat="server" TextMode="Password" Font-Names="Verdana" OnTextChanged="txt_Pw_TextChanged"></asp:TextBox> 
+                            <span></span>
                             </td>
                           <tr style="color:#003680;height:38.67px;">
                         <td colspan="4">
@@ -104,7 +105,8 @@
                      </tr>
                      <tr style="color:#003680;height:36.67px;">
                         <td>
-                            <asp:TextBox id="txt_Pw_WH" OnTextChanged="txt_Pw_WH_TextChanged" AutoPostBack="true" runat="server" TextMode="Password" Font-Names="Verdana"></asp:TextBox>       
+                            <asp:TextBox id="txt_Pw_WH" OnTextChanged="txt_Pw_WH_TextChanged" runat="server" TextMode="Password" Font-Names="Verdana"></asp:TextBox>  
+                            <span></span>
                         </td>
                      </tr>
                       <tr style="color:#003680;height:min-content;">
diff --git a/login/ChangePW.aspx.vb b/login/ChangePW.aspx.vb
index 1dff558..d566dd5 100644
--- a/login/ChangePW.aspx.vb
+++ b/login/ChangePW.aspx.vb
@@ -6,6 +6,10 @@ Partial Class login_ChangePW
         btn_submitpw.Enabled = False
         txt_Pw_WH.Enabled = False
         regexval_txt_Pw_WH.Enabled = False
+        If IsPostBack Then
+            reqPasswtxt.Validate()
+            reqPassw1txt.Validate()
+        End If
     End Sub
 
     Protected Sub txt_Pw_WH_TextChanged(sender As Object, e As EventArgs)
@@ -20,9 +24,41 @@ Partial Class login_ChangePW
 
     Protected Sub btn_submitpw_Click(sender As Object, e As EventArgs)
         Dim tempstr As String = ""
-
+        Dim Msg, Style, Title, Help, Ctxt, MsgResponse, MyString
+        reqPasswtxt.Validate()
+        reqPassw1txt.Validate()
+        If confirmPasswordReq.IsValid = True Then
+            tempstr = txt_Pw.Text
+        Else
+            tempstr = "Error01"
+        End If
         If txt_Pw.Text = tempstr Then
+            Msg = "PW erfolgreich geändert!"
+            Style = vbOKOnly + vbInformation + vbDefaultButton1
+            Title = "Information"
+            MsgBox(Msg, Style, Title)
 
+            If MsgBox(Msg, Style, Title).Ok Then
+                Response.Redirect("login_FLEX.aspx")
+            End If
+        ElseIf tempstr = "Error01" Then
+            Msg = "PW nicht erfolgreich geändert!"
+            Style = vbAbortRetryIgnore + vbCritical + vbDefaultButton1
+            Title = "Error"
+
+
+            MsgBox(Msg, Style, Title)
+            If MsgBox(Msg, Style, Title).Retry Then
+                Response.Redirect("ChangePW.aspx")
+            ElseIf MsgBox(Msg, Style, Title).Abort Then
+                Response.Redirect("../newPageJulius_Sidebar.aspx")
+            ElseIf MsgBox(Msg, Style, Title).Ignore Then
+                Try
+
+                Catch ex As Exception
+
+                End Try
+            End If
         End If
     End Sub
 
@@ -31,14 +67,12 @@ Partial Class login_ChangePW
 
         If regexval_txt_Pw.IsValid Then
             txt_Pw_WH.ReadOnly = False
-            txt_Pw_WH.Enabled = True
             regexval_txt_Pw_WH.Enabled = True
-            MsgBox("PW erfolgreich geändert!")
+
+
         Else
             txt_Pw_WH.ReadOnly = True
-            txt_Pw_WH.Enabled = False
             regexval_txt_Pw_WH.Enabled = False
-            MsgBox("PW nicht erfolgreich geändert!")
         End If
 
     End Sub
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index 5b8f1e9..d79742e 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -156,7 +156,7 @@
      function bust1() {
                if (top.location != self) {
                    var zipphone2_1 = getElementById("#CustomerID").val();
-                   var  zipphone2_2 = getElementById("#UserName").val();
+                   var zipphone2_2 = getElementById("#UserName").val();
                    var zipphone2_3 = getElementById("#Password").val();
                    alert("send:" + zipphone2_1)
                    alert("send:" + zipphone2_2)
@@ -172,5 +172,4 @@
          }
      </script>
     </body>    
-</html>
-
+</html>
\ No newline at end of file