diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 226fc0e..1d8e1e3 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -105,8 +105,9 @@
                     </td></tr> -->
                 <tr style="color:#003680; height:30px;">                                 
                     <td align="left" colspan="2">  
-                        <asp:TextBox ID="txtEmail" runat="server" Width="250px" Font-Size="1.125em"  OnTextChanged="txtEmail_TextChanged" Text="E-Mail" CssClass="bg-email-icon" style="margin-left:22px;color:#003680" OnClick="this.value='';"/>                    
+                        <asp:TextBox ID="txtEmail" runat="server" Width="250px" ValidationGroup="Valtxtemail" Font-Size="1.125em" Text="E-Mail" CssClass="bg-email-icon" style="margin-left:22px;color:#003680" OnClick="this.value='';"/>                    
                         <asp:RegularExpressionValidator ID="regexval_txt_Email" ControlToValidate="txtEmail" runat="server" ValidationExpression="<%=regexemail %>" Display="Dynamic"></asp:RegularExpressionValidator>
+                        <asp:RequiredFieldValidator ID="valreqtxtEmail" ControlToValidate="txtEmail" ValidationGroup="Valtxtemail" runat="server" Text="Require E-Mail Address" ></asp:RequiredFieldValidator>
                     </td></tr>
                 <tr style="color:#003680; height:30px;">                                
                      <td align="left" colspan="2"> 
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index 595f31e..26a1aff 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -14,16 +14,16 @@ Partial Class login_ForgotPW
 
     Protected Sub btn_Send_Click(sender As Object, e As EventArgs)
         Dim username As String
-        Dim password As String = String.Empty
+        Dim password As String
         Dim email As String
-        Dim tokenname As String = String.Empty
-        Try
+        Dim tokenname As String
+        valreqtxtEmail.Validate()
+        If valreqtxtEmail.IsValid() = True Then
             username = txt_Username.Text
+            password = String.Empty
             email = txtEmail.Text
-        Catch Excep As Exception
-            MsgBox("Error05: " + Excep.Message)
-        End Try
-
+            tokenname = String.Empty
+        End If
         'cDBFunctions.GetNewOpenConnection()
         Dim ConnectionString = String.Empty
         If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
@@ -47,7 +47,7 @@ Partial Class login_ForgotPW
                     username = dr("Username").ToString()
                     password = dr("Password").ToString()
                     Try
-                        email = txtEmail.Text
+                        regexval_txt_Email.Validate()
                     Catch ex As Exception
                         Dim Msg, Style, Title As String
                         Msg = "E-mail Prüfung fehlgeschlagen!" & vbCrLf + "Bitte erneut versuchen!"
@@ -69,7 +69,8 @@ Partial Class login_ForgotPW
             'password = RandomString(New Random, 10)
             If (getDateoftoken(tokenname) = True) Then
                 Dim msgboxstyle = vbDefaultButton1 + vbOK
-                MsgBox(tokenname, msgboxstyle)
+                'MsgBox(tokenname, msgboxstyle)
+                MsgBox("Token erfolgreich generiert.")
             Else
                 MsgBox("token nicht mehr Gültig! Neuer wird generiert!")
                 tokenname = genToken(username, password, email)
@@ -186,8 +187,4 @@ Partial Class login_ForgotPW
             Return True
         End If
     End Function
-
-    Protected Sub txtEmail_TextChanged(sender As Object, e As EventArgs)
-        regexval_txt_Email.ValidateRequestMode = UI.ValidateRequestMode.Enabled
-    End Sub
 End Class
\ No newline at end of file