diff --git a/app/helpers/emailContentGenerator.js b/app/helpers/emailContentGenerator.js
index 253d518..d201e8f 100644
--- a/app/helpers/emailContentGenerator.js
+++ b/app/helpers/emailContentGenerator.js
@@ -171,13 +171,23 @@ const generateCheckUpEmail = searchRequest => {
     priceMax
   } = searchRequest;
 
+  let emailFrequencyTitle;
+  switch (searchRequest.emailFrequency) {
+    case EMAIL_FREQUENCY.ASAP.stringId:
+      emailFrequencyTitle = EMAIL_FREQUENCY.ASAP.title;
+      break;
+    case EMAIL_FREQUENCY.DAILY.stringId:
+      emailFrequencyTitle = EMAIL_FREQUENCY.DAILY.title;
+      break;
+  }
+
   const gardenSize = realEstateType.hasGardenSize
     ? `<div><strong>Kvadratura okućnice: Od ${gardenSizeMin} do ${gardenSizeMax} m2</strong></div>`
     : ``;
 
-  const emailFooter = generateEmailFooter(id);
+  const emailFooter = generateEmailFooter(id, emailFrequencyTitle);
 
-  return `<h3>Zdravo</h3>
+  return `<h3>${stagingTag}Zdravo</h3>
   <div><strong>Kivi tim traži nekretnine za Vas i kada to ne vidite.</strong></div>
   <br />
   <div>Vaša trenutno aktivna pretraga je:</div>
diff --git a/app/services/notificationService.js b/app/services/notificationService.js
index 1e05e5e..6eaa1a4 100644
--- a/app/services/notificationService.js
+++ b/app/services/notificationService.js
@@ -1,5 +1,8 @@
 "use strict";
 const { STAGING } = require("../config/appConfig");
+
+const stagingTag = STAGING ? "[STAGING] " : "";
+
 const {
   matchRealEstates,
   matchSearchRequest
@@ -27,7 +30,6 @@ const notifyForNewSearchRequest = async searchRequest => {
 
   const searchRequestId = searchRequest.id;
   const matchingRealEstates = matches[searchRequestId].realEstates;
-  const stagingTag = STAGING ? "[STAGING] " : "";
   const emailContent = generateNewSearchRequestEmail(
     searchRequest,
     matchingRealEstates
@@ -134,7 +136,7 @@ const checkUpNotify = async () => {
 
   for (const searchRequest of searchRequestsForCheckUp) {
     const { email } = searchRequest.dataValues;
-    const emailSubject = `Kivi: Mi tražimo nekretnine za vas!`;
+    const emailSubject = `${stagingTag}Kivi: Mi tražimo nekretnine za vas!`;
     const emailContent = generateCheckUpEmail(searchRequest.dataValues);
 
     const sendEmailPromise = sendEmail(email, emailSubject, emailContent);