diff --git a/app/controllers/querySubmit.js b/app/controllers/querySubmit.js
index 4564b23..1768575 100644
--- a/app/controllers/querySubmit.js
+++ b/app/controllers/querySubmit.js
@@ -42,7 +42,7 @@ const postQuerySubmit = async (req, res) => {
   searchRequest.subscribed = true;
   await searchRequest.save();
 
-  sendTemplatedEmail(req.body.email, searchRequest);
+  sendTemplatedEmail(emailInput, searchRequest);
   res.redirect(nextStep);
 };
 
diff --git a/app/helpers/awsEmail.js b/app/helpers/awsEmail.js
index 4dbb22a..bb1c80c 100644
--- a/app/helpers/awsEmail.js
+++ b/app/helpers/awsEmail.js
@@ -69,8 +69,8 @@ const getGreetingsEmailHTML = realEstateRequest => {
   <div> 
 
   </div>
-  <div><strong> Ako želis prestati dobijati obavještenja za ovu pretragu klikni ${APP_URL}/odjava/${realEstateRequest.uniqueId} </strong></div>
-  <div><strong>Ako želiš promijeniti uslove pretrage klikni  ${APP_URL}/pregled/${realEstateRequest.uniqueId} </strong></div>
+  <div><strong> Ako želis prestati dobijati obavještenja za ovu pretragu klikni ${APP_URL}/odjava/${realEstateRequest.id} </strong></div>
+  <div><strong>Ako želiš promijeniti uslove pretrage klikni  ${APP_URL}/pregled/${realEstateRequest.id} </strong></div>
     <h4> Tvoj,
     Javimi tim.  
     </h4>`;
@@ -91,9 +91,9 @@ const getGreetingsEmailTextVersion = realEstateRequest => {
   ${gardenSize}\n
   Cijena od ${realEstateRequest.priceMin} do ${realEstateRequest.priceMax} \n 
   Ako želis prestati dobijati obavještenja za ovu pretragu klikni
-    ${APP_URL}/odjava/${realEstateRequest.uniqueId}\n 
+    ${APP_URL}/odjava/${realEstateRequest.id}\n 
   Ako želiš promijeniti uslove pretrage klikni
-    ${APP_URL}/odpregled/${realEstateRequest.uniqueId}\n 
+    ${APP_URL}/odpregled/${realEstateRequest.id}\n 
    Tvoj,\n Javimi tim`;
 };
 
@@ -109,7 +109,7 @@ const sendBulkEmail = async marketAlerts => {
     const RERequestUuidsArray = Array.from(new Set(RERequestUuidsMaped));
 
     const RERequestUuids = RERequestUuidsArray.map(marketAlert => {
-      return { uniqueId: marketAlert };
+      return { id: marketAlert };
     });
 
     const RERequests = await allRERequestByUiid(RERequestUuids);
@@ -117,13 +117,11 @@ const sendBulkEmail = async marketAlerts => {
 
     RERequests.forEach(RERequest => {
       var formatedRequest = {};
-      formatedRequest[RERequest.uniqueId] = requestDataValues[
-        RERequest.uniqueId
-      ] = {
+      formatedRequest[RERequest.id] = requestDataValues[RERequest.id] = {
         realEstateType: RERequest.realEstateType,
         region: RERequest.region,
         municipality: RERequest.municipality,
-        requestUrl: `${APP_URL}/nekretnine/${RERequest.uniqueId}`
+        requestUrl: `${APP_URL}/nekretnine/${RERequest.id}`
       };
     });