diff --git a/.gitignore b/.gitignore
index d91bc98..566cb01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,4 @@ marketing/
 firmware/
 log/
 settings/config.php
-
+settings/settings.php
diff --git a/account.php b/account.php
index 02c7d5e..49ad5ae 100644
--- a/account.php
+++ b/account.php
@@ -236,7 +236,7 @@ $view .= '<div class="content-block">
     <div class="block-header">
         <i class="fa-solid fa-bars fa-sm"></i>'.$view_asset_actions.'
     </div>
-    <a href="index.php?page=equipments&partnerID='.$soldto_id[0].'" class="btn">'.$button_partner_assigned_equipment.'</a>
+    <a href="index.php?page=equipments&partnerid='.$soldto_id[0].'" class="btn">'.$button_partner_assigned_equipment.'</a>
     <a href="index.php?page=contracts&accountID='.$account_hierarchy->soldto.'" class="btn">'.$button_partner_assigned_contracts.'</a>
 
 </div>';
diff --git a/assets/functions.php b/assets/functions.php
index c81eed3..0494817 100644
--- a/assets/functions.php
+++ b/assets/functions.php
@@ -597,6 +597,21 @@ function urlGETdetails($input){
     }
 
 }
+//------------------------------------------
+// Retrieve all $_GET from URL for FILTER AND SORT
+//------------------------------------------
+function urlGETdetailsFilter($input){
+  if(isset($input) && !empty($input)){
+    $view = '';
+    foreach ($_GET as $key => $value){
+      $view .= '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+      }
+      return $view;
+  }
+  else {
+    return $view = '';
+  }
+}
 
 //------------------------------------------
 // Translate name of Partner
diff --git a/equipments.php b/equipments.php
index 0b12910..2af667a 100644
--- a/equipments.php
+++ b/equipments.php
@@ -31,6 +31,9 @@ $servicedate = isset($_GET['servicedate']) ? '&servicedate='.$_GET['servicedate'
 $warrantydate = isset($_GET['warrantydate']) ? '&warrantydate='.$_GET['warrantydate'] : '';
 $partnerid = isset($_GET['partnerid']) ? '&partnerid='.$_GET['partnerid'] : '';
 
+//GET PARAMETERS FOR FILTERS
+$filter = urlGETdetailsFilter($_GET) ?? '';
+
 // Determine the URL
 $url = 'index.php?page=equipments'.$status.$search.$software.$servicedate.$warrantydate.$partnerid.$sort;
 //GET Details from URL
@@ -92,7 +95,7 @@ if ($create_allowed ===1){
 }
 $view .= '    
     <form action="" method="get">
-        <input type="hidden" name="page" value="equipments">
+        '.$filter.'
         <div class="filters">
             <a href="#"><i class="fa-solid fa-filter"></i>'.$general_filters.'</a>
             <div class="list">
diff --git a/user.php b/user.php
index 03904f2..3e804f1 100644
--- a/user.php
+++ b/user.php
@@ -170,7 +170,7 @@ $view .= '       </select>
                 <label for="profile">'.$User_profile.'</label>
         ';
     //Show profiles for AMIN         
-    if ($_SESSION['permission'] == 4){  
+    if ($_SESSION['permission'] == 3 || $_SESSION['permission'] == 4){  
         $view .='<select id="settings" name="settings">      
                     <option value="" '.($user['settings']== ''?' selected':'').'></option>
                     <option value="'.$setting1.'" '.($user['settings']== $setting1?' selected':'').'>'.$setting1.'</option>