diff --git a/components/publisher/PublisherForm.js b/components/publisher/PublisherForm.js
index 1635270..fc4b42f 100644
--- a/components/publisher/PublisherForm.js
+++ b/components/publisher/PublisherForm.js
@@ -246,15 +246,54 @@ export default function PublisherForm({ item, me }) {
               <label className="label" htmlFor="town">Град</label>
               <input type="text" id="town" name="town" value={publisher.town} onChange={handleChange} className="textbox" placeholder="Град" autoFocus />
             </div>
-            <div className="mb-4">
-              {/* notifications */}
-              <div className="form-check">
-                <input className="checkbox" type="checkbox" id="isSubscribedToCoverMe" name="isSubscribedToCoverMe" onChange={handleChange} checked={publisher.isSubscribedToCoverMe} autoComplete="off" />
-                <label className="label" htmlFor="isSubscribedToCoverMe">Абониран за имейли за заместване</label>
-                <input className="checkbox" type="checkbox" id="isSubscribedToReminders" name="isSubscribedToReminders" onChange={handleChange} checked={publisher.isSubscribedToReminders} autoComplete="off" />
-                <label className="label" htmlFor="isSubscribedToReminders">Абониран за напомняния (имейл)</label>
-                {/* prompt to install PWA */}
-              </div>
+
+            {/* notifications */}
+            <div className="mb-6 p-4 border border-gray-300 rounded-lg">
+              <fieldset>
+                <legend className="text-lg font-medium mb-2">Известия по имейл</legend>
+                <div className="space-y-4">
+                  <div className="form-check">
+                    <input
+                      className="checkbox cursor-not-allowed opacity-50"
+                      type="checkbox"
+                      id="isSubscribedToCoverMeMandatory"
+                      name="isSubscribedToCoverMeMandatory"
+                      onChange={handleChange} // This will not fire due to being disabled, but kept for consistency
+                      checked={true} // Always checked
+                      disabled={true} // User cannot change this field
+                      autoComplete="off" />
+                    <label className="label cursor-not-allowed opacity-50" htmlFor="isSubscribedToCoverMeMandatory">
+                      Имейли за заместване които отговарят на моите предпочитания
+                    </label>
+                  </div>
+                  <div className="form-check">
+                    <input
+                      className="checkbox"
+                      type="checkbox"
+                      id="isSubscribedToCoverMe"
+                      name="isSubscribedToCoverMe"
+                      onChange={handleChange}
+                      checked={publisher.isSubscribedToCoverMe}
+                      autoComplete="off" />
+                    <label className="label" htmlFor="isSubscribedToCoverMe">
+                      Всички заявки за заместване
+                    </label>
+                  </div>
+                  <div className="form-check">
+                    <input
+                      className="checkbox"
+                      type="checkbox"
+                      id="isSubscribedToReminders"
+                      name="isSubscribedToReminders"
+                      onChange={handleChange}
+                      checked={publisher.isSubscribedToReminders}
+                      autoComplete="off" />
+                    <label className="label" htmlFor="isSubscribedToReminders">
+                      Други напомняния
+                    </label>
+                  </div>
+                </div>
+              </fieldset>
             </div>
 
             {/* button to install PWA */}
@@ -267,6 +306,7 @@ export default function PublisherForm({ item, me }) {
             {/* ADMINISTRATORS ONLY */}
             <ProtectedRoute allowedRoles={[UserRole.ADMIN]} deniedMessage=" " className="">
               <div className="border border-blue-500 border-solid p-2">
+                {/* prompt to install PWA */}
                 <PwaManager />
                 <div className="mb-4">
                   <label className="label" htmlFor="type">Тип</label>
diff --git a/components/publisher/SearchReplacement.js b/components/publisher/SearchReplacement.js
index 5d69bf1..9f9b545 100644
--- a/components/publisher/SearchReplacement.js
+++ b/components/publisher/SearchReplacement.js
@@ -85,43 +85,46 @@ function ConfirmationModal({ isOpen, onClose, onConfirm, subscribedPublishers, a
     return (
         <div className="fixed inset-0 flex items-center justify-center z-50">
             <div className="absolute inset-0 bg-black opacity-50" onClick={onClose}></div>
-            <div className="bg-white p-6 rounded-lg shadow-lg z-10">
+            <div className="bg-white p-6 rounded-lg shadow-lg z-10 max-h-screen overflow-y-auto">
                 <h2 className="text-lg font-semibold mb-4">Можете да изпратите заявка за заместник до следните групи:</h2>
-                <div className="mb-4">
-                    <label className="block mb-2">
-                        <div className="flex items-center mb-2">
-                            <input
-                                type="checkbox"
-                                className="mr-2 leading-tight"
-                                checked={selectedGroups.includes('subscribedPublishers')}
-                                onChange={() => handleToggleGroup('subscribedPublishers')}
-                            />
-                            <span className="text-sm font-medium">Абонирани:</span>
-                        </div>
-                        <div className="flex flex-wrap">
-                            {subscribedPublishers.map(pub => (
-                                <span key={pub.id} className="bg-gray-200 rounded-full px-3 py-1 text-sm font-semibold text-gray-700 mr-2 mb-2">{pub.name}</span>
-                            ))}
-                        </div>
-                    </label>
-                </div>
-                <div className="mb-4">
-                    <label className="block mb-2">
-                        <div className="flex items-center mb-2">
-                            <input
-                                type="checkbox"
-                                className="mr-2 leading-tight"
-                                checked={selectedGroups.includes('availablePublishers')}
-                                onChange={() => handleToggleGroup('availablePublishers')}
-                            />
-                            <span className="text-sm font-medium">На разположение :</span>
-                        </div>
-                        <div className="flex flex-wrap">
-                            {availablePublishers.map(pub => (
-                                <span key={pub.id} className="bg-gray-200 rounded-full px-3 py-1 text-sm font-semibold text-gray-700 mr-2 mb-2">{pub.name}</span>
-                            ))}
-                        </div>
-                    </label>
+                <div className="space-y-1">
+                    <div className="flex items-center mb-2">
+                        <input id="subscribedPublishersCheckbox"
+                            type="checkbox"
+                            className="mr-2 leading-tight"
+                            checked={selectedGroups.includes('subscribedPublishers')}
+                            onChange={() => handleToggleGroup('subscribedPublishers')}
+                        />
+                        <label htmlFor="subscribedPublishersCheckbox" className="text-sm font-medium">Абонирани:</label>
+                    </div>
+                    <div className="overflow-y-auto max-h-64">
+                        <label className="block mb-2">
+                            <div className="flex flex-wrap">
+                                {subscribedPublishers.map(pub => (
+                                    <span key={pub.id} className="bg-gray-200 rounded-full px-3 py-1 text-sm font-semibold text-gray-700 mr-2 mb-2">{pub.name}</span>
+                                ))}
+                            </div>
+                        </label>
+                    </div>
+                    <div className="flex items-center mb-2">
+                        <input id="availablePublishersCheckbox"
+                            type="checkbox"
+                            className="mr-2 leading-tight"
+                            checked={selectedGroups.includes('availablePublishers')}
+                            onChange={() => handleToggleGroup('availablePublishers')}
+                        />
+                        <label htmlFor="availablePublishersCheckbox" className="text-sm font-medium">На разположение :</label>
+                    </div>
+                    <div className="overflow-y-auto max-h-64">
+                        <label className="block mb-2">
+
+                            <div className="flex flex-wrap">
+                                {availablePublishers.map(pub => (
+                                    <span key={pub.id} className="bg-gray-200 rounded-full px-3 py-1 text-sm font-semibold text-gray-700 mr-2 mb-2">{pub.name}</span>
+                                ))}
+                            </div>
+                        </label>
+                    </div>
                 </div>
                 <div className="text-right">
                     <button
diff --git a/package-lock.json b/package-lock.json
index e6292bd..1dbaf43 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,6 @@
         "axios": "^1.6.7",
         "axios-jwt": "^4.0.2",
         "bcrypt": "^5.1.1",
-        "bcryptjs": "^2.4.3",
         "date-fns": "^3.3.1",
         "docx": "^8.5.0",
         "docx-templates": "^4.11.4",
@@ -5499,11 +5498,6 @@
         "tweetnacl": "^0.14.3"
       }
     },
-    "node_modules/bcryptjs": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz",
-      "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="
-    },
     "node_modules/bidi-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz",
diff --git a/pages/auth/signin.tsx b/pages/auth/signin.tsx
index 8a43446..b95ca14 100644
--- a/pages/auth/signin.tsx
+++ b/pages/auth/signin.tsx
@@ -132,9 +132,11 @@ export default function SignIn({ csrfToken }) {
 
 // This gets called on every request
 export async function getServerSideProps(context) {
+    const csrfToken = await getCsrfToken(context);
     return {
         props: {
-            csrfToken: await getCsrfToken(context),
+            ...(csrfToken ? { csrfToken } : {}),
         },
     };
 }
+