diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index 3ee824b..8bc5f20 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -231,8 +231,8 @@ Partial Class login_ForgotPW
             Dim wenn As DateTime = DateTime.UtcNow.AddSeconds(-5)
 
             If jetzt < wenn Then
-                'Return "NotYet"
-                'Else
+                Return "NotYet"
+            Else
                 token = genToken(username, password, email)
                 Return token
                 'End If
@@ -246,17 +246,14 @@ Partial Class login_ForgotPW
         If wenn > DateTime.UtcNow.AddMinutes(-30) Then
             tokenname = String.Empty
             'MsgBox("Token has not been found or is too old!" + Environment.NewLine + "Please send a new E-mail!")
-
-            Session.Remove("TokenforEmail")
-
-
-            Return False
-        ElseIf tokenname = "NotYet" Then
             Session.Remove("TokenforEmail")
             Return False
         ElseIf tokenname = "Error04" Then
+            tokenname = String.Empty
             Session.Remove("TokenforEmail")
             Return False
+        ElseIf tokenname = "NotYet" Then
+            Return True
         Else
             Return True
         End If