diff --git a/buildtool.php b/buildtool.php
index 0ef86bf..8968e48 100644
--- a/buildtool.php
+++ b/buildtool.php
@@ -52,10 +52,12 @@ $view .= '<div class="content-block">
     </div>
     <p id="servicetoken" value="" hidden>'.$bearertoken.'</p>
     <div>
-    <select id="productlist" style="width: 100%;padding: 15px 5px;margin-bottom: 25px;border: 0;border-bottom: 1px solid #dedfe1;" name="productlist" >
+    <select id="productlist" style="width: 100%;padding: 15px 5px;margin-bottom: 25px;border: 0;border-bottom: 1px solid #dedfe1;" name="productlist" onchange="storeProduct()">
         <option selected value="0">Assign Product</option>
     ';
-
+    //GET DEFAULT VALUE FROM SESSION STORAGE
+    $view .=' <option id="productselected" selected value="0">Assign Product</option>';
+    
     foreach ($messages as $message){   
         $view .='<option value="'.$message["rowID"].'|'.$message["product_category"].'|'.$message["sn"].'">'.$message["productcode"].' - '.$message["productname"].'</option>';
     }
@@ -114,6 +116,21 @@ echo '
             display = document.querySelector(\'#time\');
         startTimer(startMinute, display);
     };
+
+    if (sessionStorage["productvalue"] && sessionStorage["productvalue"].length != 0){
+        document.getElementById("productselected").value = sessionStorage.getItem("productvalue");
+        document.getElementById("productselected").innerHTML = sessionStorage.getItem("producttext") ;
+    }
+
+    function storeProduct(){
+        var product = document.getElementById("productlist");
+        var productSelected = product.options[product.selectedIndex].value;
+        var productSelectedText = product.options[product.selectedIndex].innerHTML;
+        sessionStorage.setItem("productvalue", productSelected);
+        sessionStorage.setItem("producttext", productSelectedText);
+    }
+
+
 </script>';