diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index 6f538a1..20ec33c 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -48,6 +48,26 @@ Partial Class login_ForgotPW
                 If dr.Read() Then
                     username = dr("Username").ToString()
                     password = dr("Password").ToString()
+                    Try
+                        If email = dr("Email").ToString() Then
+                            email = txtEmail.Text
+                        Else
+                            MsgBox("Error bei Email- Authentifizierung. Diese Mail stimmt nicht mit den hinterlegten Account-informationen überein.")
+                            con.Close()
+                        End If
+                    Catch ex As Exception
+                        Dim Msg, Style, Title As String
+                        Msg = "E-mail Prüfung fehlgeschlagen!" & vbCrLf + "Bitte erneut versuchen!"
+                        Style = vbRetry + vbExclamation + vbDefaultButton1
+                        Title = "Fehler bei E-mail Authentifizierung!"
+                        MsgBox(Msg, Style, Title)
+
+                        If MsgBox(Msg, Style, Title).Retry Then
+                            txtEmail.Text = ""
+                            txtEmail.Focus()
+                        End If
+                    End Try
+
                 End If
             End Using
             con.Close()
@@ -55,7 +75,8 @@ Partial Class login_ForgotPW
 
         If Not String.IsNullOrEmpty(username) Then
             'password = RandomString(New Random, 10)
-            SendEmail(username, password, email)
+            genToken(username, password, email)
+            'SendEmail(username, password, email)
             MsgBox("Mail would be sent successfully!")
             lblMessage.ForeColor = Color.Green
             lblMessage.Text = "Passwort wurde erfolgreich an die angegebene E-Mail Adresse gesendet."
@@ -90,17 +111,15 @@ Partial Class login_ForgotPW
         mySmtpsvr.Port = 587 '25
         mySmtpsvr.UseDefaultCredentials = False
         mySmtpsvr.Credentials = myCredentials
-        Try
 
+        Try
             Msg.From = New MailAddress("al@verag.ag")
             Msg.To.Add(email)
             Msg.Subject = "Passwort reset"
             Msg.Body = String.Format("Sehr geehrte/r {0},<br /><br /> Der Link zum Zurücksetzen des Passwortes lautet:<br /><br /><br />.<br />" + Environment.NewLine + lkb.PostBackUrl + Environment.NewLine + "<br />Mit freundlichen Grüßen,", username, password)
-
             '     Dim attachment As Attachment = New Attachment(File.OpenRead(excel), "Kundenliste.xlsx")
             '     Msg.Attachments.Add(attachment)
             mySmtpsvr.Send(Msg)
-
             MsgBox("SENT")
             Return True
         Catch ex As Exception