diff --git a/web-app/app/ui/LocationEditForm.tsx b/web-app/app/ui/LocationEditForm.tsx
index b3cef2f..57fe430 100644
--- a/web-app/app/ui/LocationEditForm.tsx
+++ b/web-app/app/ui/LocationEditForm.tsx
@@ -359,6 +359,9 @@ export const LocationEditForm: FC<LocationEditFormProps> = ({ location, yearMont
                     {(formValues.billFwdEnabled || formValues.rentDueNotificationEnabled) && (
                         <fieldset className="fieldset bg-base-200 border-base-300 rounded-box w-xs border p-4 pb-2 mt-4">
                             <legend className="fieldset-legend font-semibold uppercase">{t("tenant-email-legend")}</legend>
+                            <label className="label">
+                                <span className="label-text">{t("tenant-email-label")}</span>
+                            </label>
                             <input
                                 id="tenantEmail"
                                 name="tenantEmail"
@@ -424,11 +427,6 @@ export const LocationEditForm: FC<LocationEditFormProps> = ({ location, yearMont
                                         </p>
                                     ))}
                             </div>
-                        </fieldset>
-                    )}
-
-                    <fieldset className="fieldset bg-base-200 border-base-300 rounded-box w-xs border p-4 pb-2 mt-4">
-                        <legend className="fieldset-legend font-semibold uppercase">{t("notification-language-legend")}</legend>
                         <label className="label">
                             <span className="label-text">{t("notification-language-label")}</span>
                         </label>
@@ -442,7 +440,8 @@ export const LocationEditForm: FC<LocationEditFormProps> = ({ location, yearMont
                             <option value="hr">{t("notification-language-option-hr")}</option>
                             <option value="en">{t("notification-language-option-en")}</option>
                         </select>
-                    </fieldset>
+                        </fieldset>
+                    )}
 
                     <fieldset className="fieldset bg-base-200 border-base-300 rounded-box w-xs border p-4 pb-2 mt-4">
                         <legend className="fieldset-legend font-semibold uppercase text-base">{t("scope-legend")}</legend>
diff --git a/web-app/messages/en.json b/web-app/messages/en.json
index d91a1cf..00243ec 100644
--- a/web-app/messages/en.json
+++ b/web-app/messages/en.json
@@ -195,6 +195,7 @@
     "rent-amount-label": "Monthly rent amount",
     "rent-amount-placeholder": "enter rent amount",
     "tenant-email-legend": "TENANT EMAIL",
+    "tenant-email-label": "Send tenant notifications to e-mail address:",
     "tenant-email-placeholder": "enter tenant's email",
     "email-status": {
       "reset-button-label": "Reset",
@@ -205,8 +206,7 @@
       "verified": "this e-mail address has been verified",
       "unsubscribed": "tenant unsubscribed this address from receiving emails"
     },
-    "notification-language-legend": "NOTIFICATION EMAIL LANGUAGE",
-    "notification-language-label": "Language for automatic notification emails",
+    "notification-language-label": "Send tenant notifications in language:",
     "notification-language-option-hr": "Croatian (Hrvatski)",
     "notification-language-option-en": "English",
     "warning-missing-tenant-names": "Warning: Tenant first and last name are missing. The 2D barcode will not be displayed to the tenant when they open the shared link until both fields are filled in.",
diff --git a/web-app/messages/hr.json b/web-app/messages/hr.json
index 0c238e4..a18424e 100644
--- a/web-app/messages/hr.json
+++ b/web-app/messages/hr.json
@@ -194,6 +194,7 @@
     "rent-amount-label": "Iznos najamnine",
     "rent-amount-placeholder": "unesite iznos najamnine",
     "tenant-email-legend": "EMAIL PODSTANARA",
+    "tenant-email-label": "Obavijesti podstanara šalji na e-mail adresu:",
     "tenant-email-placeholder": "unesite email podstanara",
     "email-status": {
       "reset-button-label": "Reset",
@@ -204,8 +205,7 @@
       "verified": "podstanar je potvrdio ovu e-mail adresu",
       "unsubscribed": "podstanar je odjavio ovu e-mail adresu"
     },
-    "notification-language-legend": "JEZIK ZA OBAVIJESTI",
-    "notification-language-label": "Jezik za automatske obavijesti putem e-maila",
+    "notification-language-label": "Obavijesti za podstanara šalji na jeziku:",
     "notification-language-option-hr": "Hrvatski",
     "notification-language-option-en": "Engleski (English)",
     "warning-missing-tenant-names": "Upozorenje: Ime i prezime podstanara nedostaju. 2D barkod neće biti prikazan podstanaru kada otvori podijeljenu poveznicu dok oba polja ne budu popunjena.",