diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index d27febf..39377ff 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -647,6 +647,13 @@ Partial Class CustomsAviso
     End Sub
 
     Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
+        Dim erster = New Date(Now().Year, Now().Month, 1)
+        pickdate1.Text = erster.Day.ToString + "." + erster.Month.ToString + "." + erster.Year.ToString
+        pickdate2.Text = Date.Parse(erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
+        datevon = Nothing
+        datebis = Nothing
+        dt = Nothing
+        normaltable.Rows.Clear()
         If String.IsNullOrEmpty(txt_Absender_M.Text) = False Or String.IsNullOrEmpty(txt_Empfaenger_M.Text) = False Or String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) = False Or String.IsNullOrEmpty(txt_LKWNr_M.Text) = False Or rbt_Alle_M.Checked = True Or rbt_Ankunft_M.Checked = True Or rbt_Erf_M.Checked = True Or rbt_Freig_M.Checked = True Or rbt_Vorb_M.Checked = True Or rbt_Vorg_M.Checked = True Then
             'Mobil
             rbt_Alle_M.Checked = True
@@ -678,13 +685,6 @@ Partial Class CustomsAviso
             rbt_Vorg.Disabled = False
             rbt_Vorb.Checked = False
             rbt_Vorb.Disabled = False
-            Dim erster = New Date(Now().Year, Now().Month, 1)
-            pickdate1.Text = erster.Day.ToString + "." + erster.Month.ToString + "." + erster.Year.ToString
-            pickdate2.Text = Date.Parse(erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
-            datevon = Nothing
-            datebis = Nothing
-            dt = Nothing
-            normaltable.Rows.Clear()
             Response.Redirect(Request.RawUrl)
             Return
         ElseIf String.IsNullOrEmpty(txt_Absender.Text) = False Or String.IsNullOrEmpty(txt_Empfaenger.Text) = False Or String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = False Or String.IsNullOrEmpty(txt_LKWNr.Text) = False Or rbt_Alle.Checked = True Or rbt_Ankunft.Checked = True Or rbt_Erf.Checked = True Or rbt_Freig.Checked = True Or rbt_Vorb.Checked = True Or rbt_Vorg.Checked = True Then
@@ -723,13 +723,6 @@ Partial Class CustomsAviso
             txt_Empfaenger.Text = ""
             txt_KdNrAuftrag.Text = ""
             txt_LKWNr.Text = ""
-            Dim erster = New Date(Now().Year, Now().Month, 1)
-            pickdate1.Text = erster.Day.ToString + "." + erster.Month.ToString + "." + erster.Year.ToString
-            pickdate2.Text = Date.Parse(erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
-            datevon = Nothing
-            datebis = Nothing
-            dt = Nothing
-            normaltable.Rows.Clear()
             Response.Redirect(Request.RawUrl)
             Return
         End If
diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb
index 992f619..c127d81 100644
--- a/Customers/Invoices.aspx.vb
+++ b/Customers/Invoices.aspx.vb
@@ -541,27 +541,63 @@ Partial Class Customers_Default3
 
     Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
         dt = Nothing
-        txt_Absender.Text = String.Empty
-        txt_Absender_M.Text = String.Empty
-        txt_Empfaenger.Text = String.Empty
-        txt_Empfaenger_M.Text = String.Empty
-        txt_KdNrAuftrag.Text = String.Empty
-        txt_KdNrAuftrag_M.Text = String.Empty
-        txt_LKW.Text = String.Empty
-        txt_LKW_M.Text = String.Empty
-        txt_ReNr.Text = String.Empty
-        txt_ReNr_M.Text = String.Empty
-        datevon = Date.ParseExact("01." + Date.Now.Month.ToString + "." + Date.Now.Year.ToString, "dd.MM.yyyy", Nothing)
-        datebis = Date.Now
-        pickdate1.Text = datevon.ToString
-        pickdate2.Text = datebis.ToString
+        Session.Remove("mytable")
         Kdnrtext = ""
         Absender = ""
         Empfaenger = ""
         LKWNR = ""
         KDNAFNR = ""
         reNr = ""
-        Session.Remove("mytable")
+        datevon = Date.ParseExact("01." + Date.Now.Month.ToString + "." + Date.Now.Year.ToString, "dd.MM.yyyy", Nothing)
+        datebis = Date.Now
+        pickdate1.Text = datevon.ToString
+        pickdate2.Text = datebis.ToString
+        If String.IsNullOrEmpty(txt_Absender.Text) = False Or String.IsNullOrEmpty(txt_Empfaenger.Text) = False Or String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = False Or String.IsNullOrEmpty(txt_LKW.Text) = False Or String.IsNullOrEmpty(txt_ReNr.Text) = False Then
+            txt_Absender.Text = String.Empty
+            txt_Empfaenger.Text = String.Empty
+            txt_KdNrAuftrag.Text = String.Empty
+            txt_LKW.Text = String.Empty
+            txt_ReNr.Text = String.Empty
+
+            valdaterage_1.Enabled = True
+            valdaterange_2.Enabled = True
+            valreq_pickdate1.Enabled = True
+            valreq_pickdate2.Enabled = True
+            regex_txt_Absender_M.Enabled = True
+            regex_txt_Empaenger_M.Enabled = True
+            regex_txt_KdNrAuftrag_M.Enabled = True
+            regex_txt_LKW_M.Enabled = True
+            regex_txt_ReNr_M.Enabled = True
+            'Mobil
+            regex_txt_Absender.Enabled = False
+            regex_txt_Empfaenger.Enabled = False
+            regex_txt_KdNrAuftrag.Enabled = False
+            regex_txt_LKW.Enabled = False
+            regex_txt_ReNr.Enabled = False
+            Response.Redirect(Request.RawUrl)
+            Return
+        ElseIf String.IsNullOrEmpty(txt_Absender.Text) = False Or String.IsNullOrEmpty(txt_Empfaenger.Text) = False Or String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = False Or String.IsNullOrEmpty(txt_LKW.Text) = False Or String.IsNullOrEmpty(txt_ReNr.Text) = False Then
+            txt_Absender_M.Text = String.Empty
+            txt_Empfaenger_M.Text = String.Empty
+            txt_KdNrAuftrag_M.Text = String.Empty
+            txt_LKW_M.Text = String.Empty
+            txt_ReNr_M.Text = String.Empty
+
+            regex_txt_Absender.Enabled = True
+            regex_txt_Empfaenger.Enabled = True
+            regex_txt_KdNrAuftrag.Enabled = True
+            regex_txt_LKW.Enabled = True
+            regex_txt_ReNr.Enabled = True
+            'Desktop
+            regex_txt_Absender.Enabled = True
+            regex_txt_Empfaenger.Enabled = True
+            regex_txt_KdNrAuftrag.Enabled = True
+            regex_txt_LKW.Enabled = True
+            regex_txt_ReNr.Enabled = True
+            Response.Redirect(Request.RawUrl)
+            Return
+        End If
+
         'MsgBox("Reset")
     End Sub