diff --git a/Customers/Customers.master b/Customers/Customers.master
index 8ee8059..4086877 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -224,6 +224,7 @@
                                                                                               createdUserDate = dr("CreatedDate").ToString()
                                                                                               emailuser = dr("Email").ToString()
                                                                                               CustomerID = dr("KundenNr").ToString
+                                                                                              Session.Add("CustomerID", CustomerID)
                                                                                           End If
                                                                                       End Using
                                                                                       con.Close()
@@ -276,7 +277,7 @@
                                                                     <%ElseIf Me.Page.User.Identity.Name = "userwithlongername" Then%>
                                                                         <li><a type="button" class="btn btn-primary" href="#" aria-disabled="true" data-bs-toggle="tooltip" data-bs-placement="top" title="Bald verfügbar!" style="background-color:#fff;color:#043381;text-align:left;border:none">Coming soon</a></li>
                                                                     <%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
-                                                                        <li><a type="button" class="btn btn-primary" href="Invoices.aspx" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
+                                                                        <li><a type="button" class="btn btn-primary" href="Invoices.aspx?P1=<%=CustomerID %>" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
                                                                     <%End If %>                                                                
                                                              <!--  </ul>-->
                                                         </li>                                                        
@@ -302,11 +303,11 @@
                                                                     <%If Me.Page.User.Identity.Name = "test" Then %>
                                                                         <li><a href="#" aria-disabled="true" data-bs-toggle="tooltip" data-bs-placement="top" title="Bald verfügbar!" style="background-color:#fff;color:#043381;text-align:left;border:none">Coming soon</a></li>
                                                                     <%ElseIf Me.Page.User.Identity.Name = "test2" Then %>
-                                                                        <li><a href="Invoices.aspx" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
+                                                                        <li><a href="Invoices.aspx?P1=<%=CustomerID %>" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
                                                                     <%ElseIf Me.Page.User.Identity.Name = "userwithlongername" Then%>
                                                                         <li><a type="button" class="btn btn-primary" href="#" aria-disabled="true" data-bs-toggle="tooltip" data-bs-placement="top" title="Bald verfügbar!" style="background-color:#fff;color:#043381;text-align:left;border:none">Coming soon</a></li>
                                                                     <%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
-                                                                        <li><a type="button" class="btn btn-primary" href="Invoices.aspx" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
+                                                                        <li><a type="button" class="btn btn-primary" href="Invoices.aspx?P1=<%=CustomerID %>" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
                                                                     <%End If %>                                                                
                                                              <!--  </ul>-->
                                                         </li>                
@@ -458,9 +459,9 @@
                                                                                                            <%If Me.Page.User.Identity.Name = "test" Then %>
                                                                                                               <a type="button" class="btn btn-primary" href="CustomsAviso.aspx">Aufträge</a>
                                                                                                            <%ElseIf Me.Page.User.Identity.Name = "test2" Then%>
-                                                                                                              <a type="button" class="btn btn-primary" href="Invoices.aspx">Rechnungen</a>
+                                                                                                              <a type="button" class="btn btn-primary" href="Invoices.aspx?P1=<%=CustomerID %>">Rechnungen</a>
                                                                                                            <%ElseIf Me.Page.User.Identity.Name = "userwithlongername" Then%>
-                                                                                                              <a type="button" class="btn btn-primary" href="Invoices.aspx">Rechnungen</a>
+                                                                                                              <a type="button" class="btn btn-primary" href="Invoices.aspx?P1=<%=CustomerID %>">Rechnungen</a>
                                                                                                            <%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
                                                                                                              <a type="button" class="btn btn-primary" href="CustomsAviso.aspx" aria-disabled="false" data-bs-toggle="tooltip" data-bs-placement="top" title="Aufträge" style="background-color:#fff;color:#043381;text-align:left;border:none">Aufträge</a>
                                                                                                            <% End If %>
@@ -477,13 +478,13 @@
                                                                                                         </div>                                                    
                                                                                                           <div class="btn-group">
                                                                                                               <%If Me.Page.User.Identity.Name = "test" Then %>
-                                                                                                                <a type="button" class="btn btn-primary" href="Invoices.aspx">Rechnungen</a>
+                                                                                                                <a type="button" class="btn btn-primary" href="Invoices.aspx?P1=<%=CustomerID %>">Rechnungen</a>
                                                                                                               <%ElseIf Me.Page.User.Identity.Name = "test2" Then%>
                                                                                                                 <a type="button" class="btn btn-primary" href="Cards_Boxes.aspx">Karten_Boxen</a>
                                                                                                               <%ElseIf Me.Page.User.Identity.Name = "userwithlongername" Then%>
-                                                                                                                 <a type="button" class="btn btn-primary" href="CustomsAviso.aspx" aria-disabled="false" data-bs-toggle="tooltip" data-bs-placement="top" title="Aufträge" style="background-color:#fff;color:#043381;text-align:left;border:none">Aufträge</a> 
+                                                                                                                 <a type="button" class="btn btn-primary" href="CustomsAviso.aspx?P1=<%=CustomerID %>" aria-disabled="false" data-bs-toggle="tooltip" data-bs-placement="top" title="Aufträge" style="background-color:#fff;color:#043381;text-align:left;border:none">Aufträge</a> 
                                                                                                               <%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
-                                                                                                              <a type="button" class="btn btn-primary" href="Invoices.aspx">Rechnungen</a>
+                                                                                                              <a type="button" class="btn btn-primary" href="Invoices.aspx?P1=<%=CustomerID %>">Rechnungen</a>
                                                                                                               <% End If %>
                                                                                                          <!--  <button type="button" class="btn btn-danger dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="background-color:#fff; color:#043381;border:hidden;">
                                                                                                             <span class="visually-hidden">Toggle Dropdown</span>
diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb
index 397011a..9bc9656 100644
--- a/Customers/Invoices.aspx.vb
+++ b/Customers/Invoices.aspx.vb
@@ -19,30 +19,30 @@ Partial Class Customers_Default3
         If Not Me.Page.User.Identity.IsAuthenticated Then
             FormsAuthentication.RedirectToLoginPage()
         Else
-            Try
-                Kdnrtext = Session.Item("CustomerID")
-            Catch ex As UnauthorizedAccessException When String.IsNullOrEmpty(Session.Item("CustomerID"))
+            If String.IsNullOrEmpty(Request.QueryString("P1")) = False Then
+                Kdnrtext = Request.QueryString("P1")
+            Else
                 lbl_status.Text = "Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!"
-            End Try
+            End If
 
             DataBind()
-            tbl_Header_row.TableSection = TableRowSection.TableHeader
+                tbl_Header_row.TableSection = TableRowSection.TableHeader
 
-            If (Page.IsPostBack And normaltable.EnableViewState = False) Then
-                Page.MaintainScrollPositionOnPostBack = True
-                normaltable.EnableViewState = True
-                If valreq_pickdate1.IsValid And valreq_pickdate2.IsValid Then
-                    datevon = Date.Parse(pickdate1.Text)
-                    datebis = Date.Parse(pickdate2.Text)
-                Else
-                    Dim erster = New Date(Now().Year, Now().Month, 1)
-                    datevon = erster
-                    datebis = Date.Parse(Now.ToShortDateString)
-                    pickdate1.Text = erster.ToShortDateString()
-                    pickdate2.Text = Date.Now.ToShortDateString()
+                If (Page.IsPostBack And normaltable.EnableViewState = False) Then
+                    Page.MaintainScrollPositionOnPostBack = True
+                    normaltable.EnableViewState = True
+                    If valreq_pickdate1.IsValid And valreq_pickdate2.IsValid Then
+                        datevon = Date.Parse(pickdate1.Text)
+                        datebis = Date.Parse(pickdate2.Text)
+                    Else
+                        Dim erster = New Date(Now().Year, Now().Month, 1)
+                        datevon = erster
+                        datebis = Date.Parse(Now.ToShortDateString)
+                        pickdate1.Text = erster.ToShortDateString()
+                        pickdate2.Text = Date.Now.ToShortDateString()
+                    End If
                 End If
             End If
-        End If
     End Sub
 
     Protected Sub initcells(tr As TableRow, t1 As TableCell, t2 As TableCell, t3 As TableCell, t4 As TableCell, t5 As TableCell, t6 As TableCell, t7 As TableCell, t8 As TableCell, th1 As TableHeaderCell, th2 As TableHeaderCell, th3 As TableHeaderCell, th4 As TableHeaderCell, th5 As TableHeaderCell, th6 As TableHeaderCell, th7 As TableHeaderCell, th8 As TableHeaderCell)
@@ -136,11 +136,11 @@ Partial Class Customers_Default3
 
     Protected Sub btn_b_Click(sender As Object, e As EventArgs)
         dt = Nothing
-        Try
-            Kdnrtext = Session.Item("CustomerID")
-        Catch ex As UnauthorizedAccessException When String.IsNullOrEmpty(Session.Item("CustomerID"))
+        If String.IsNullOrEmpty(Request.QueryString("P1")) = False Then
+            Kdnrtext = Request.QueryString("P1")
+        Else
             lbl_status.Text = "Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!"
-        End Try
+        End If
         If valdaterage_1.IsValid And valdaterange_2.IsValid Then
             If String.IsNullOrEmpty(Kdnrtext) = False Then
                 If Not String.IsNullOrEmpty(txt_Absender.Text) Then
@@ -159,7 +159,7 @@ Partial Class Customers_Default3
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation"
                     End Try
                 End If
-                If Not String.IsNullOrEmpty(txt_Empfaenger.Text) = True Then
+                If String.IsNullOrEmpty(txt_Empfaenger.Text) = False Then
                     txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                     regex_txt_Empfaenger.Enabled = True
                     regex_txt_Empfaenger.Validate()
@@ -175,7 +175,7 @@ Partial Class Customers_Default3
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation"
                     End Try
                 End If
-                If Not String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = True Then
+                If String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = False Then
                     txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                     regex_txt_KdNrAuftrag.Enabled = True
                     regex_txt_KdNrAuftrag.Validate()
@@ -191,7 +191,7 @@ Partial Class Customers_Default3
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation"
                     End Try
                 End If
-                If Not String.IsNullOrEmpty(txt_LKW.Text) = True Then
+                If String.IsNullOrEmpty(txt_LKW.Text) = False Then
                     txt_LKW.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                     regex_txt_LKW.Enabled = True
                     regex_txt_LKW.Validate()
@@ -207,7 +207,7 @@ Partial Class Customers_Default3
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation"
                     End Try
                 End If
-                If Not String.IsNullOrEmpty(txt_ReNr.Text) = True Then
+                If String.IsNullOrEmpty(txt_ReNr.Text) = False Then
                     txt_ReNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                     regex_txt_ReNr.Enabled = True
                     regex_txt_ReNr.Validate()
@@ -224,7 +224,7 @@ Partial Class Customers_Default3
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error invoice number validation"
                     End Try
                 End If
-                If Not String.IsNullOrEmpty(txt_Absender_M.Text) = True Then
+                If String.IsNullOrEmpty(txt_Absender_M.Text) = False Then
                     txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                     regex_txt_Absender_M.Enabled = True
                     regex_txt_Absender_M.Validate()
@@ -240,7 +240,7 @@ Partial Class Customers_Default3
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation"
                     End Try
                 End If
-                If Not String.IsNullOrEmpty(txt_Empfaenger_M.Text) = True Then
+                If String.IsNullOrEmpty(txt_Empfaenger_M.Text) = False Then
                     txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                     regex_txt_Empaenger_M.Enabled = True
                     regex_txt_Empaenger_M.Validate()
@@ -256,7 +256,7 @@ Partial Class Customers_Default3
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation"
                     End Try
                 End If
-                If Not String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) = True Then
+                If String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) = False Then
                     txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                     regex_txt_KdNrAuftrag_M.Enabled = True
                     regex_txt_KdNrAuftrag_M.Validate()
@@ -272,7 +272,7 @@ Partial Class Customers_Default3
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation"
                     End Try
                 End If
-                If Not String.IsNullOrEmpty(txt_LKW_M.Text) Then
+                If String.IsNullOrEmpty(txt_LKW_M.Text) = False Then
                     txt_LKW_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                     regex_txt_LKW_M.Enabled = True
                     regex_txt_LKW_M.Validate()
@@ -288,7 +288,7 @@ Partial Class Customers_Default3
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation"
                     End Try
                 End If
-                If Not String.IsNullOrEmpty(txt_ReNr_M.Text) Then
+                If String.IsNullOrEmpty(txt_ReNr_M.Text) = False Then
                     txt_ReNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                     regex_txt_ReNr_M.Enabled = True
                     regex_txt_ReNr_M.Validate()
diff --git a/Fehlermeldungen_Auflistung.xlsx b/Fehlermeldungen_Auflistung.xlsx
index e8ff1e1..dd0b564 100644
Binary files a/Fehlermeldungen_Auflistung.xlsx and b/Fehlermeldungen_Auflistung.xlsx differ
diff --git a/login/Change_PW.aspx.vb b/login/Change_PW.aspx.vb
index ee2942e..f3df835 100644
--- a/login/Change_PW.aspx.vb
+++ b/login/Change_PW.aspx.vb
@@ -7,7 +7,7 @@ Partial Class login_Change_PW
     Protected Sub Page_Load(sender As Object, e As EventArgs)
         Dim url = Request.ServerVariables("URL")
         Session.Add("urltochangepw", url)
-        If VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("TokenforEmail").ToString()) = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1")) AndAlso VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("TokenforEmail").ToString()) = Not Nothing AndAlso VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1")) = Not Nothing And VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("USerID").ToString()) = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par3") And VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(Session.Item("test")) = VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(Request.QueryString("Par2"))) Then
+        If VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("TokenforEmail").ToString()) = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1")) AndAlso VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("TokenforEmail").ToString()) = Not Nothing AndAlso VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1")) = Not Nothing And VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("CustomerID").ToString()) = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par3") And VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(Session.Item("test")) = VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(Request.QueryString("Par2"))) Then
             If getDateoftoken(VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1"))) = True Then
                 Try
                     txt_Pw_WH.Enabled = True
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb
index 074de72..cde0170 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -3,6 +3,12 @@ Imports System.Data
 
 Partial Class login_FLEX
     Inherits System.Web.UI.Page
+
+    Dim Customer_ID As String = String.Empty
+    Dim UserNaMe As String = String.Empty
+    Dim passw As String = String.Empty
+
+
     Protected Sub Page_Load(sender As Object, e As EventArgs)
         If Me.Page.User.Identity.IsAuthenticated Then
             Response.Redirect("../Customers/Welcome.aspx", False)
@@ -47,9 +53,7 @@ Partial Class login_FLEX
         Dim cb As CheckBox = Login1.FindControl("RememberMe")
         Dim cb_M As CheckBox = Login2.FindControl("RememberMe_M")
 
-        Dim Customer_ID As String = String.Empty
-        Dim UserNaMe As String = String.Empty
-        Dim passw As String = String.Empty
+
 
         If String.IsNullOrEmpty(tb.Text) = False AndAlso String.IsNullOrEmpty(tb_M.Text) = True Then
             reqfieldvaluserID.Enabled = True
@@ -174,7 +178,7 @@ Partial Class login_FLEX
 
                             MsgBox("Erfolgreich validiert.")
                             Session.Add("test", UserNaMe)
-                            Session.Add("UserID", Customer_ID)
+                            Session.Add("CustomerID", Customer_ID)
                             Session.Add("PW", passw)
 
                             'FormsAuthentication.SetAuthCookie(Login1.UserName, True)
@@ -196,8 +200,16 @@ Partial Class login_FLEX
 
     Protected Sub LoginButton_Click(sender As Object, e As EventArgs)
         Validate("Login")
+        Session.Add("test", UserNaMe)
+        Session.Add("CustomerID", Customer_ID)
+        Session.Add("PW", passw)
+
     End Sub
     Protected Sub LoginButton_M_Click(sender As Object, e As EventArgs)
         Validate("Login_M")
+        Session.Add("test", UserNaMe)
+        Session.Add("CustomerID", Customer_ID)
+        Session.Add("PW", passw)
+
     End Sub
 End Class