diff --git a/login/Change_PW.aspx b/login/Change_PW.aspx
index 074c974..0ef2715 100644
--- a/login/Change_PW.aspx
+++ b/login/Change_PW.aspx
@@ -305,6 +305,11 @@
                             <asp:Label ID="lbl_messagetext" runat="server" Text=""></asp:Label>
                         </td>
                     </tr>
+                    <tr>
+                        <td>
+                            <asp:LinkButton ID="btn_toLogin" ClientIDMode="AutoID" runat="server" style="color:#fff;background-color:#043381" OnClick="btn_toLogin_Click" CssClass="btn btn-primary"><center><label for="<%=btn_toLogin.ClientID %>" style="color:#fff">Back to Login</label></center></asp:LinkButton>
+                        </td>
+                    </tr>
                 </table>
                     </center>
                 </div>
@@ -384,6 +389,11 @@
                                  <asp:Label ID="lbl_messagetext_M" runat="server" Text=""></asp:Label>
                             </td>
                         </tr>
+                                  <tr>
+                                      <td>
+                                          <asp:LinkButton ID="btn_toLogin_M" style="color:#043381" Font-Size="1em" CssClass="btn btn-primary" runat="server" OnClick="btn_toLogin_M_Click"><center><label for="<%=btn_toLogin_M.ClientID %>" style="color:#fff">Back to Login</label></center></asp:LinkButton>
+                                      </td>
+                                  </tr>
                     </table>  
                       </div>
                 </center>
diff --git a/login/Change_PW.aspx.vb b/login/Change_PW.aspx.vb
index df59545..ccc3f24 100644
--- a/login/Change_PW.aspx.vb
+++ b/login/Change_PW.aspx.vb
@@ -8,7 +8,8 @@ Partial Class login_Change_PW
         Dim url = Request.ServerVariables("URL")
         Session.Add("urltochangepw", url)
         Dim ConnectionString = ""
-
+        btn_toLogin.Visible = False
+        btn_toLogin_M.Visible = False
         If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
             VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
             'ConnectionString = "Server=DEVELOPER\DEVSQL;Database=VERAG_HOMEPAGE;Uid=sa;Pwd=BmWr501956"
@@ -70,6 +71,7 @@ Partial Class login_Change_PW
                         VERAG_VARIABLES.seterrorcount(1)
                         lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb + "Link ist abgelaufen. Bitte neue E-Mail senden."
                         'Response.Redirect("ForgotPW.aspx")
+                        btn_toLogin.Visible = True
                     End If
                     dr.Close()
                 End If
@@ -172,7 +174,8 @@ Partial Class login_Change_PW
                 End Using
             Else
                 VERAG_VARIABLES.seterrorcount(22)
-                lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb + "Error bei der Passwort-Validation."
+                'lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb + "Error bei der Passwort-Validation."
+                btn_toLogin.Visible = True
             End If
 
         Else
@@ -230,6 +233,8 @@ Partial Class login_Change_PW
                     VERAG_VARIABLES.seterrorcount(22)
                     'lbl_messagetext_M.ForeColor = Drawing.Color.Red
                     'lbl_messagetext_M.Text = VERAG_VARIABLES.geterrornumb() + "Error bei der Validierung des Kennwortes."
+                    btn_toLogin_M.Visible = True
+                    btn_toLogin.Visible = False
                 End If
             Catch ex As Exception
                 lbl_messagetext.Text = ex.Message
@@ -416,4 +421,12 @@ Partial Class login_Change_PW
             End If
         End If
     End Sub
+
+    Protected Sub btn_toLogin_Click(sender As Object, e As EventArgs)
+        Response.Redirect("login_FLEX.aspx")
+    End Sub
+
+    Protected Sub btn_toLogin_M_Click(sender As Object, e As EventArgs)
+        Response.Redirect("login_FLEX.aspx")
+    End Sub
 End Class
\ No newline at end of file