diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index 96f74b9..39cd8f7 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -14,6 +14,7 @@ Partial Class CustomsAviso
     Dim dt As DataTable
     Dim Art As String = ""
     Dim ckd As Integer = -1
+    Dim wasmobile As Boolean = True
     Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
         Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms
 
@@ -392,7 +393,6 @@ Partial Class CustomsAviso
 
     Protected Sub btn_Auftraege_Click(sender As Object, e As EventArgs)
         dt = Nothing
-
         Session.Add("mytable", Nothing)
         If Session.Item("mytable") = Nothing Then
             If txt_Absender.Text IsNot "" Then
@@ -415,6 +415,7 @@ Partial Class CustomsAviso
                 regexval_txt_Empfaenger.Validate()
                 If regexval_txt_Empfaenger.IsValid Then
                     Try
+                        wasmobile = False
                         Empfaenger = txt_Empfaenger.Text
                     Catch ex As FormatException
                         MsgBox("Diese Daten können nicht validiert werden", MsgBoxStyle.Critical)
@@ -457,6 +458,7 @@ Partial Class CustomsAviso
                 regval_txt_Absender_M.Validate()
                 If regval_txt_Absender_M.IsValid Then
                     Try
+                        wasmobile = True
                         Absender = txt_Absender_M.Text
                     Catch ex As FormatException
                         MsgBox("Diese Daten können nicht validiert werden", MsgBoxStyle.Critical)
diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx
index f660b73..5445207 100644
--- a/Customers/Invoices.aspx
+++ b/Customers/Invoices.aspx
@@ -102,14 +102,7 @@
                                     <asp:TextBox ID="pickdate1" Type="Date" CssClass="classTarget" runat="server" ClientIDMode="Predictable"></asp:TextBox>
                                     <asp:RequiredFieldValidator ControlToValidate="pickdate1" Display="Dynamic" ID="valreq_pickdate1" runat="server" ErrorMessage=""></asp:RequiredFieldValidator>
                                     <asp:CustomValidator runat="server" ID="valdaterage_1" OnServerValidate="valdaterage_1_ServerValidate" ControlToValidate="pickdate1" ForeColor="Red" Display="Dynamic" ErrorMessage="Fehler in Von-Feld" SetFocusOnError="true"></asp:CustomValidator> 
-                                     <!-- Desktop/Tablet -->
-                                    <div class="d-none d-md-block">
-                                    <asp:Label ID="lbl_bis" runat="server">Zu:</asp:Label>
-                                        </div>
-                                        <!-- Mobil -->
-                                <div class="d-md-none">
-                                    <asp:Label ID="Label1" runat="server" style="margin-left:6px">Zu:</asp:Label>
-                                    </div>
+                                    <asp:Label ID="lbl_bis" runat="server">Bis:</asp:Label>                                       
                                     <asp:Textbox ID="pickdate2" Type="Date" CssClass="classTarget" runat="server"></asp:Textbox>
                                     <asp:RequiredFieldValidator ControlToValidate="pickdate2" Display="Dynamic" ID="valreq_pickdate2" runat="server" ErrorMessage=""></asp:RequiredFieldValidator>
                                     <asp:CustomValidator ControlToValidate="pickdate2" runat="server" Display="Dynamic" ID="valdaterange_2" OnServerValidate="valdaterange_2_ServerValidate" ErrorMessage="Fehler in Bis-Feld" SetFocusOnError="true"></asp:CustomValidator>
@@ -156,7 +149,8 @@
                                     <div class="container" style="margin-left:-10px">
                                      <div class="row">
                                            <div id="rowcols4" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
-                                               <asp:TextBox ID="txt_LKW_M" runat="server" PlaceHolder="truck license plate" style="width:155px;"></asp:TextBox> 
+                                               <asp:Label ID="lbl_LKW_M" runat="server" style="color:#043381" Font-Size="1em">LKW Kennzeichen:</asp:Label>
+                                               <asp:TextBox ID="txt_LKW_M" runat="server" PlaceHolder="truck license plate" style="width:155px;margin-left:5px"></asp:TextBox> 
                                                <asp:RequiredFieldValidator ControlToValidate="txt_LKW_M" runat="server" ID="regval_txt_LKW_M" Enabled="false"></asp:RequiredFieldValidator>
                                                <asp:RegularExpressionValidator ControlToValidate="txt_LKW_M" runat="server" ForeColor="Red" ID="regex_txt_LKW_M" ValidationExpression="[A-Z0-9]{4,30}\d" Display="Dynamic" ErrorMessage="Wrong plate format!" SetFocusOnError="true" Enabled="false"></asp:RegularExpressionValidator>
                                                <asp:TextBox ID="txt_KdNrAuftrag_M" runat="server" PlaceHolder="Customer Order Nr" style="width:155px;margin-left:28px"></asp:TextBox> 
@@ -167,7 +161,7 @@
                                              <asp:TextBox ID="txt_Absender_M" runat="server" PlaceHolder="Sender" style="width:155px;"></asp:TextBox>
                                              <asp:RequiredFieldValidator ControlToValidate="txt_Absender_M" runat="server" style="width:155px;margin-left:18px" Enabled="false" ID="req_txt_Absender_M" ErrorMessage="*" ForeColor="Red"></asp:RequiredFieldValidator>
                                              <asp:RegularExpressionValidator ControlToValidate="txt_Absender_M" runat="server" ID="regex_txt_Absender_M" Enabled="false" ValidationExpression="[^!,]{2,90}" ForeColor="Red" SetFocusOnError="true" Display="Dynamic" ErrorMessage="Wrong Input! Try again!"></asp:RegularExpressionValidator>
-                                             <asp:TextBox ID="txt_Empfaenger_M" runat="server" PlaceHolder="Receiver" style="width:155px;margin-left:4px"></asp:TextBox>
+                                             <asp:TextBox ID="txt_Empfaenger_M" runat="server" PlaceHolder="Receiver" style="width:155px"></asp:TextBox>
                                              <asp:RequiredFieldValidator ControlToValidate="txt_Empfaenger_M" runat="server" ID="reqval_txt_Empfaenger_M" ForeColor="Red" Enabled="false" Display="Dynamic"></asp:RequiredFieldValidator>
                                              <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger_M" ID="regex_txt_Empaenger_M" runat="server" ForeColor="Red" Enabled="false" ValidationExpression="[^!,]{2,90}" Display="Dynamic" style="width:105px;margin-left:13px" SetFocusOnError="true" ErrorMessage="Error! Try again!"></asp:RegularExpressionValidator>
                                           </div>
diff --git a/css/Customers/Invoices.css b/css/Customers/Invoices.css
index 9a49bf9..3de7733 100644
--- a/css/Customers/Invoices.css
+++ b/css/Customers/Invoices.css
@@ -139,7 +139,7 @@ ContentPlaceHolder1_Send_Data {
     #normaltable {
         width: 100%;
     }
-    #conovertab {
+    #ContentPlaceHolder1_conovertab {
         /* max-width:width:150px 11.25em;*/
         margin-left: /*14px*/ 3.0837004405286343vw;
         max-width: /*390px;*/ 85.90308370044053vw;
@@ -148,12 +148,15 @@ ContentPlaceHolder1_Send_Data {
     #ContentPlaceHolder1_Send_Data {
         height: 15px;
         width: 300px;
-    }    
-    #pickdate1 {
+    }
+    #ContentPlaceHolder1_lbl_bis {
         border: 1px solid #000000;
+        margin-left: 15px;
     }
 
-    #pickdate1 {
+    #ContentPlaceHolder1_pickdate1 {
         border: 1px solid #000000;
+        margin-left: 15px;
     }
+    
 }  
\ No newline at end of file
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index 7fbb1c1..2c03dc5 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -345,9 +345,9 @@ Partial Class ForgotPW
                             username = dr("Username").ToString()
                             password = dr("Password").ToString()
                             email = dr("Email").ToString()
-                            customerID = dr("UserId").ToString()
+                            customerID = dr("KundenNr").ToString()
                             Try
-                                If (txt_CustomerID_M.Text = dr("userId").ToString() AndAlso String.IsNullOrEmpty(txt_CustomerID.Text) = True) And String.IsNullOrEmpty(customerID) = True Then
+                                If (txt_CustomerID_M.Text = dr("KundenNr").ToString() AndAlso String.IsNullOrEmpty(txt_CustomerID.Text) = True) And String.IsNullOrEmpty(customerID) = False Then
                                     customerID = txt_CustomerID_M.Text
                                     lblMessage_M.ForeColor = Color.Green
                                     isuserIDright = True
@@ -383,7 +383,7 @@ Partial Class ForgotPW
                                 Title = "Authentication error!"
                             End Try
                             Try
-                                If (txt_Username_M.Text = dr("Username").ToString() AndAlso String.IsNullOrEmpty(txt_Username_M.Text) = True) And String.IsNullOrEmpty(customerID) = True Then
+                                If (txt_Username_M.Text = dr("Username").ToString() AndAlso String.IsNullOrEmpty(txt_Username.Text) = True) And String.IsNullOrEmpty(customerID) = False Then
                                     username = txt_Username_M.Text
                                     lblMessage_M.ForeColor = Color.Green
                                     isusernameright = True