diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb
index aca0688..abda963 100644
--- a/App_Code/VERAG_VARIABLES.vb
+++ b/App_Code/VERAG_VARIABLES.vb
@@ -9,7 +9,7 @@ Public Class VERAG_VARIABLES
         errornumb += 1
     End Sub
     Shared Function geterrornumb() As String
-        Return Environment.NewLine + "Error:" + Space(1) + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(errornumb.ToString)
+        Return Environment.NewLine + "Error:" + Space(1) + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(errornumb.ToString) + Space(1)
     End Function
 
 End Class
diff --git a/login/Change_PW.aspx.vb b/login/Change_PW.aspx.vb
index f3df835..f9e4a49 100644
--- a/login/Change_PW.aspx.vb
+++ b/login/Change_PW.aspx.vb
@@ -31,7 +31,9 @@ Partial Class login_Change_PW
                 regexval_txt_Pw_WH.Enabled = False
             End If
         Else
-            MsgBox("Link ist abgelaufen. Bitte neue E-Mail senden.", MsgBoxStyle.Critical, "Error06")
+            VERAG_VARIABLES.initerrorcount()
+            VERAG_VARIABLES.seterrorcount(1)
+            lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb + "Link ist abgelaufen. Bitte neue E-Mail senden."
             Response.Redirect("ForgotPW.aspx")
         End If
     End Sub
@@ -149,7 +151,8 @@ Partial Class login_Change_PW
             'End If
         ElseIf tempstr = "Error01" Then
             regexval_txt_Pw.ForeColor = Drawing.Color.MediumVioletRed
-            regexval_txt_Pw.Text = "Password has not been changed successfully!"
+            VERAG_VARIABLES.seterrorcount(2)
+            regexval_txt_Pw.Text = VERAG_VARIABLES.geterrornumb + "Password has not been changed successfully!"
             '   Msg = "PW nicht erfolgreich geändert!"
             '  Style = vbAbortRetryIgnore + vbCritical + vbDefaultButton1
             ' Title = "Error"
@@ -186,9 +189,11 @@ Partial Class login_Change_PW
         If wenn < DateTime.UtcNow.AddMinutes(-30) Then
             nameoftoken = String.Empty
             If VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("Mob").ToString()) = "True" Then
-                lbl_messagetext.Text = "Token has not been found or is too old!" + Environment.NewLine + "Please send a new E-mail!"
+                VERAG_VARIABLES.seterrorcount(101)
+                lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb + "Token has not been found or is too old!" + Environment.NewLine + "Please send a new E-mail!"
             ElseIf VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("Mob").ToString()) = "False" Then
-                lbl_messagetext_M.Text = "Token has not been found or is too old!" + Environment.NewLine + "Please send a new E-mail!"
+                VERAG_VARIABLES.seterrorcount(101)
+                lbl_messagetext_M.Text = VERAG_VARIABLES.geterrornumb + "Token has not been found or is too old!" + Environment.NewLine + "Please send a new E-mail!"
             End If
             'MsgBox("Token has not been found or is too old!" + Environment.NewLine + "Please send a new E-mail!")