diff --git a/frontend/src/pages/Applications/Applications.js b/frontend/src/pages/Applications/Applications.js
index eaf9926..7f00284 100644
--- a/frontend/src/pages/Applications/Applications.js
+++ b/frontend/src/pages/Applications/Applications.js
@@ -112,6 +112,7 @@ const ApplicationPlanModal = ({ onClose, onSubmit }) => {
     propertyId: '',
     selectedAreas: [],
     productId: '',
+    selectedProduct: null,
     applicationType: '', // 'liquid' or 'granular'
     equipmentId: '',
     notes: ''
@@ -135,11 +136,20 @@ const ApplicationPlanModal = ({ onClose, onSubmit }) => {
       console.log('Equipment response:', equipmentResponse.data);
       
       setProperties(propertiesResponse.data.data.properties || []);
-      // Combine shared and user products
-      const allProducts = [
-        ...(productsResponse.data.data.sharedProducts || []),
-        ...(productsResponse.data.data.userProducts || [])
-      ];
+      // Combine shared and user products with unique IDs
+      const sharedProducts = (productsResponse.data.data.sharedProducts || []).map(product => ({
+        ...product,
+        uniqueId: `shared_${product.id}`,
+        isShared: true
+      }));
+      
+      const userProducts = (productsResponse.data.data.userProducts || []).map(product => ({
+        ...product,
+        uniqueId: `user_${product.id}`,
+        isShared: false
+      }));
+      
+      const allProducts = [...sharedProducts, ...userProducts];
       setProducts(allProducts);
       setEquipment(equipmentResponse.data.data.equipment || []);
     } catch (error) {
@@ -297,7 +307,7 @@ const ApplicationPlanModal = ({ onClose, onSubmit }) => {
                 className="input"
                 value={planData.productId}
                 onChange={(e) => {
-                  const selectedProduct = products.find(p => p.id === parseInt(e.target.value));
+                  const selectedProduct = products.find(p => p.uniqueId === e.target.value);
                   console.log('Selected product:', selectedProduct);
                   
                   // Determine application type from product type
@@ -315,6 +325,7 @@ const ApplicationPlanModal = ({ onClose, onSubmit }) => {
                   setPlanData({ 
                     ...planData, 
                     productId: e.target.value,
+                    selectedProduct: selectedProduct,
                     applicationType: applicationType
                   });
                 }}
@@ -330,7 +341,7 @@ const ApplicationPlanModal = ({ onClose, onSubmit }) => {
                     : '';
                   
                   return (
-                    <option key={product.id} value={product.id}>
+                    <option key={product.uniqueId} value={product.uniqueId}>
                       {displayName}{brand ? ` - ${brand}` : ''}{productType ? ` (${productType})` : ''}{rateInfo}
                     </option>
                   );