diff --git a/app/ui/LocationEditForm.tsx b/app/ui/LocationEditForm.tsx
index a2b9d93..3dd5652 100644
--- a/app/ui/LocationEditForm.tsx
+++ b/app/ui/LocationEditForm.tsx
@@ -83,7 +83,7 @@ export const LocationEditForm: FC<LocationEditFormProps> = ({ location, yearMont
 
                         <InfoBox className="p-1 mb-1">{t("tenant-2d-code-info")}</InfoBox>
 
-                        <div className="form-control">
+                        <fieldset className="fieldset">
                             <label className="label cursor-pointer justify-start gap-3">
                                 <input
                                     type="checkbox"
@@ -92,9 +92,9 @@ export const LocationEditForm: FC<LocationEditFormProps> = ({ location, yearMont
                                     checked={generateTenantCode}
                                     onChange={(e) => setGenerateTenantCode(e.target.checked)}
                                 />
-                                <span className="label-text">{t("tenant-2d-code-toggle-label")}</span>
+                                <legend className="fieldset-legend">{t("tenant-2d-code-toggle-label")}</legend>
                             </label>
-                        </div>
+                        </fieldset>
 
                         {generateTenantCode && (
                             <>
@@ -152,7 +152,7 @@ export const LocationEditForm: FC<LocationEditFormProps> = ({ location, yearMont
                         <legend className="fieldset-legend font-semibold uppercase">{t("auto-utility-bill-forwarding-legend")}</legend>
                         <InfoBox className="p-1 mb-1">{t("auto-utility-bill-forwarding-info")}</InfoBox>
 
-                        <div className="form-control">
+                        <fieldset className="fieldset">
                             <label className="label cursor-pointer justify-start gap-3">
                                 <input
                                     type="checkbox"
@@ -161,9 +161,9 @@ export const LocationEditForm: FC<LocationEditFormProps> = ({ location, yearMont
                                     checked={autoBillFwd}
                                     onChange={(e) => setautoBillFwd(e.target.checked)}
                                 />
-                                <span className="label-text">{t("auto-utility-bill-forwarding-toggle-label")}</span>
+                                <legend className="fieldset-legend">{t("auto-utility-bill-forwarding-toggle-label")}</legend>
                             </label>
-                        </div>
+                        </fieldset>
 
                         {autoBillFwd && (
                             <fieldset className="fieldset mt-2 p-2">
@@ -180,7 +180,7 @@ export const LocationEditForm: FC<LocationEditFormProps> = ({ location, yearMont
                         <legend className="fieldset-legend font-semibold uppercase">{t("auto-rent-notification-legend")}</legend>
                         <InfoBox className="p-1 mb-1">{t("auto-rent-notification-info")}</InfoBox>
 
-                        <div className="form-control">
+                        <fieldset className="fieldset">
                             <label className="label cursor-pointer justify-start gap-3">
                                 <input
                                     type="checkbox"
@@ -189,9 +189,9 @@ export const LocationEditForm: FC<LocationEditFormProps> = ({ location, yearMont
                                     checked={rentDueNotification}
                                     onChange={(e) => setrentDueNotification(e.target.checked)}
                                 />
-                                <span className="label-text">{t("auto-rent-notification-toggle-label")}</span>
+                                <legend className="fieldset-legend">{t("auto-rent-notification-toggle-label")}</legend>
                             </label>
-                        </div>
+                        </fieldset>
 
                         {rentDueNotification && (
                             <fieldset className="fieldset mt-2 p-2">
@@ -231,16 +231,16 @@ export const LocationEditForm: FC<LocationEditFormProps> = ({ location, yearMont
                     <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("scope-legend")}</legend>
                             {!location ? (
-                                <div className="form-control">
+                                <fieldset className="fieldset">
                                     <label className="label cursor-pointer justify-start gap-3">
                                         <input
                                             type="checkbox"
                                             name="addToSubsequentMonths"
                                             className="toggle toggle-primary"
                                         />
-                                        <span className="label-text">{t("add-to-subsequent-months")}</span>
+                                        <legend className="fieldset-legend">{t("add-to-subsequent-months")}</legend>
                                     </label>
-                                </div>
+                                </fieldset>
 
                             ) : (
                                 <>