diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index afd107a..d81bf16 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -297,7 +297,7 @@
             <center>
                    <!-- Große Bildschirme-->   
             <div class="d-none d-md-block">
-            <table id="tbl_main" cellpadding="0" style="border:none;">
+            <table id="tbl_main" cellpadding="0" style="border:none; margin-left:-20px">
                 <tr style="color:#003680;height:28px;">
                                    <td>
                                        <asp:Button ID="btn_Back" runat="server" Width="265" CausesValidation="false" Text="Back" OnClick="btn_Back_Click" style="margin-left:49px;height:31px;font-weight:300;font-size:20px"/>
@@ -343,6 +343,7 @@
                 <tr>
                     <td>
                         <asp:Button Text="back" ID="btn_BACKafterlogin" style="background-color:#003680;color:#fff;visibility:hidden" runat="server" /> 
+                        <asp:Button Text="sendtestMail" ClientIDMode="Predictable" ID="btn_Testmail" OnClick="btn_Testmail_Click" style="background-color:#043381; color:gray" runat="server" />
                     </td>
                 </tr>
                                 </table>
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index e6cce68..79cfbdf 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -656,7 +656,7 @@ Partial Class ForgotPW
                         lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Die Paramter wurden nicht alle gesetzt. Bitte Felder überprüfen!"
                     End If
                     lblMessage.ForeColor = Color.Green
-                    lblMessage.Text = "Success" + Environment.NewLine + " Mail sent. Please check your inbox."
+                    lblMessage.Text = "Success: Mail sent. Please check your inbox."
                     'MsgBox("SENT")
                     Return True
                 Else
@@ -781,4 +781,47 @@ Partial Class ForgotPW
     'Return sb.ToString()
     'End Function
 
+
+    Protected Sub btn_Testmail_Click(sender As Object, e As EventArgs)
+        Dim username As String = "userwithlongername"
+        Dim Passw As String = "Test1!W"
+        Dim email As String = "ja@verag.ag"
+        Dim CustomerID As String = "717585"
+        Dim TheusrID As String = "3"
+        Dim tokentest As String = genToken(username, Passw, email, CustomerID, True, True, True, False, TheusrID)
+        If Session.Item("TokenforEmail") = Nothing Then
+            tokentest = genToken(username, Passw, email, CustomerID, True, True, True, False, TheusrID)
+            Session.Add("TokenforEmail", tokentest)
+            Session.Add("SessID", VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(Session.SessionID))
+        Else
+            tokentest = Session.Item("TokenforEmail")
+        End If
+
+        If SendEmail(username, Passw, email, tokentest, CustomerID, True, True, True, False, TheusrID) = True Then
+            'password = RandomString(New Random, 10)
+            If (getDateoftoken(tokentest) = True) Then
+                'Dim msgboxstyle = vbDefaultButton1 + vbOK
+                'MsgBox(tokenname, msgboxstyle)
+                lblMessage_M.ForeColor = Color.Green
+                lblMessage_M.Text = "Token generated successfully."
+                'MsgBox("Token generated successfully.")
+            Else
+                lblMessage_M.ForeColor = Color.Red
+                VERAG_VARIABLES.seterrorcount(100)
+                lblMessage_M.Text = VERAG_VARIABLES.geterrornumb + "Token is not valid anymore. Please generate a new one by sending a new e-mail!"
+                'MsgBox("Token is not valid anymore. Please generate a new one by sending a new e-mail!")
+
+                If Session.Item("TokenforEmail") = Nothing Then
+                    tokentest = genToken(username, Passw, email, CustomerID, True, True, True, False, TheusrID)
+                    Session.Add("TokenforEmail", tokentest)
+                Else
+                    tokentest = Session.Item("TokenforEmail")
+                End If
+            End If
+            'SendEmail(username, password, email)
+            'MsgBox("Mail would be sent successfully!")
+            lblMessage_M.ForeColor = Color.Green
+            lblMessage_M.Text = "The password has been sent sucessfully on the given valid e-mail address."
+        End If
+    End Sub
 End Class
\ No newline at end of file