diff --git a/login/Change_PW.aspx.vb b/login/Change_PW.aspx.vb
index c55af59..0bfb4ab 100644
--- a/login/Change_PW.aspx.vb
+++ b/login/Change_PW.aspx.vb
@@ -69,6 +69,8 @@ Partial Class login_Change_PW
                         VERAG_VARIABLES.initerrorcount()
                         VERAG_VARIABLES.seterrorcount(1)
                         lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb + "Link is invalid. Please send a new E-Mail!"
+                        btn_submitpw.Text = "Return to Login!"
+                        btn_submitpw.PostBackUrl = "login_FLEX.aspx"
                         'Response.Redirect("ForgotPW.aspx")
                     End If
                     dr.Close()
@@ -87,8 +89,9 @@ Partial Class login_Change_PW
             tokenname = nameoftoken
             'MsgBox("Token has not been found or is too old!" + Environment.NewLine + "Please send a new E-mail!")
             lbl_messagetext.Text = "Token has not been found or is too old!" + Environment.NewLine + "Please send a new E-mail!"
-
             Session.Remove("TokenforEmail")
+            btn_submitpw.Text = "Back to Login"
+            btn_submitpw.PostBackUrl = "login_FLEX.apsx"
             Return True
         ElseIf nameoftoken = "Error04" Then
             nameoftoken = String.Empty
@@ -237,6 +240,8 @@ Partial Class login_Change_PW
         ElseIf tempstr = "Error01" Then
             regexval_txt_Pw.ForeColor = Drawing.Color.MediumVioletRed
             VERAG_VARIABLES.seterrorcount(2)
+            btn_submitpw.Text = "Back to Login!"
+            btn_submitpw.PostBackUrl = "login_FLEX.apsx"
             'regexval_txt_Pw.Text = VERAG_VARIABLES.geterrornumb + "Passwords could not be found!"
             '   Msg = "PW nicht erfolgreich geändert!"
             '  Style = vbAbortRetryIgnore + vbCritical + vbDefaultButton1
@@ -379,6 +384,9 @@ Partial Class login_Change_PW
                                 cmd.ExecuteNonQuery()
                                 regexval_txt_Pw_M.ForeColor = Drawing.Color.Green
                                 regexval_txt_Pw_M.Text = "Password has been changed sucessfully!"
+                            Else
+                                btn_submitpw_M.Text = "Back to Login!"
+                                btn_submitpw_M.PostBackUrl = "login_FLEX.apsx"
                             End If
                         End Using
                         con.Close()
@@ -395,8 +403,11 @@ Partial Class login_Change_PW
             ElseIf tempstr = "Error01" Then
                 regexval_txt_Pw_M.ForeColor = Drawing.Color.MediumVioletRed
                 VERAG_VARIABLES.seterrorcount(2)
+                regexval_txt_Pw_M.Text = VERAG_VARIABLES.geterrornumb + "Passwort konnte nicht erfolgreich geändert werden!"
+                btn_submitpw_M.Text = "Back to Login!"
+                btn_submitpw_M.PostBackUrl = "login_FLEX.apsx"
                 'Button hierher
-                'regexval_txt_Pw_M.Text = VERAG_VARIABLES.geterrornumb + "Passwort konnte nicht erfolgreich geändert werden!"
+
                 '   Msg = "PW nicht erfolgreich geändert!"
                 '  Style = vbAbortRetryIgnore + vbCritical + vbDefaultButton1
                 ' Title = "Error"