diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
index f8b6760e..34d67159 100644
--- a/public/locales/en/translation.json
+++ b/public/locales/en/translation.json
@@ -93,6 +93,7 @@
   "Community Principles": "Community Principles",
   "Community values and rules of engagement for the open editorial team": "Community values and rules of engagement for the open editorial team",
   "Confirm": "Confirm",
+  "Contents": "Contents",
   "Contribute to free samizdat. Support Discours - an independent non-profit publication that works only for you. Become a pillar of the open newsroom": "Contribute to free samizdat. Support Discours - an independent non-profit publication that works only for you. Become a pillar of the open newsroom",
   "Cooperate": "Cooperate",
   "Copy link": "Copy link",
@@ -432,6 +433,7 @@
   "Username": "Username",
   "Userpic": "Userpic",
   "Users": "Users",
+  "User was not found": "User was not found",
   "Video format not supported": "Video format not supported",
   "Video": "Video",
   "Views": "Views",
@@ -484,7 +486,6 @@
   "cancel": "cancel",
   "collections": "collections",
   "community": "community",
-  "contents": "contents",
   "delimiter": "delimiter",
   "discussion": "Discours",
   "dogma keywords": "Discours.io, dogma, editorial principles, code of ethics, journalism, community",
diff --git a/public/locales/ru/translation.json b/public/locales/ru/translation.json
index 65a38874..2987f1f4 100644
--- a/public/locales/ru/translation.json
+++ b/public/locales/ru/translation.json
@@ -97,6 +97,7 @@
   "Community Principles": "Принципы сообщества",
   "Community values and rules of engagement for the open editorial team": "Ценности сообщества и правила взаимодействия открытой редакции",
   "Confirm": "Подтвердить",
+  "Contents": "Оглавление",
   "Contribute to free samizdat. Support Discours - an independent non-profit publication that works only for you. Become a pillar of the open newsroom": "Внесите вклад в свободный самиздат. Поддержите Дискурс — независимое некоммерческое издание, которое работает только для вас. Станьте опорой открытой редакции",
   "Cooperate": "Соучаствовать",
   "Copy link": "Скопировать ссылку",
@@ -507,7 +508,6 @@
   "cancel": "отменить",
   "collections": "коллекции",
   "community": "сообщество",
-  "contents": "оглавление",
   "create_chat": "Создать чат",
   "create_group": "Создать группу",
   "delimiter": "разделитель",
@@ -564,6 +564,7 @@
   "topicKeywords": "{topic}, Discours.io, статьи, журналистика, исследования",
   "topics": "темы",
   "user already exist": "пользователь уже существует",
+  "User was not found": "Пользователь не найден",
   "verified": "уже подтверждён",
   "video": "видео",
   "view": "просмотр",
diff --git a/src/components/Nav/AuthModal/LoginForm.tsx b/src/components/Nav/AuthModal/LoginForm.tsx
index 1a50aeda..925c8864 100644
--- a/src/components/Nav/AuthModal/LoginForm.tsx
+++ b/src/components/Nav/AuthModal/LoginForm.tsx
@@ -96,32 +96,36 @@ export const LoginForm = () => {
     try {
       const { errors } = await signIn({ email: email(), password: password() })
       if (errors?.length > 0) {
-        console.debug('[signIn] errors:', errors)
-        if (
-          errors.some(
-            (error) =>
-              error.message.includes('bad user credentials') || error.message.includes('user not found'),
-          )
-        ) {
-          setValidationErrors((prev) => ({
-            ...prev,
-            password: t('Something went wrong, check email and password'),
-          }))
-        } else if (errors.some((error) => error.message.includes('user not found'))) {
-          setSubmitError('Пользователь не найден')
-        } else if (errors.some((error) => error.message.includes('email not verified'))) {
-          setSubmitError(
-            <div class={styles.info}>
-              {t('This email is not verified')}
-              {'. '}
-              <span class={'link'} onClick={handleSendLinkAgainClick}>
-                {t('Send link again')}
-              </span>
-            </div>,
-          )
-        } else {
-          setSubmitError(t('Error', errors[0].message))
-        }
+        console.warn('[signIn] errors: ', errors)
+        errors.forEach((error) => {
+          switch (error.message) {
+            case 'user has not signed up email & password': {
+              setValidationErrors((prev) => ({
+                ...prev,
+                password: t('Something went wrong, check email and password'),
+              }))
+              break
+            }
+            case 'user not found': {
+              setValidationErrors((prev) => ({ ...prev, email: t('User was not found') }))
+              break
+            }
+            case 'email not verified': {
+              setValidationErrors((prev) => ({ ...prev, email: t('This email is not verified') }))
+              break
+            }
+            default:
+              setSubmitError(
+                <div class={styles.info}>
+                  {t('Error', errors[0].message)}
+                  {'. '}
+                  <span class={'link'} onClick={handleSendLinkAgainClick}>
+                    {t('Send link again')}
+                  </span>
+                </div>,
+              )
+          }
+        })
         return
       }
       hideModal()
diff --git a/src/components/TableOfContents/TableOfContents.module.scss b/src/components/TableOfContents/TableOfContents.module.scss
index 2e5fe4ac..8433e44d 100644
--- a/src/components/TableOfContents/TableOfContents.module.scss
+++ b/src/components/TableOfContents/TableOfContents.module.scss
@@ -157,7 +157,7 @@
   color: #000;
   font-size: 14px;
   font-style: normal;
-  font-weight: 400;
+  font-weight: 500;
   line-height: 1.8rem;
   text-align: left;
   vertical-align: bottom;
diff --git a/src/components/TableOfContents/TableOfContents.tsx b/src/components/TableOfContents/TableOfContents.tsx
index 322aa925..d0a2de05 100644
--- a/src/components/TableOfContents/TableOfContents.tsx
+++ b/src/components/TableOfContents/TableOfContents.tsx
@@ -86,7 +86,7 @@ export const TableOfContents = (props: Props) => {
           <Show when={isVisible()}>
             <div class={styles.TableOfContentsContainerInner}>
               <div class={styles.TableOfContentsHeader}>
-                <p class={styles.TableOfContentsHeading}>{t('contents')}</p>
+                <p class={styles.TableOfContentsHeading}>{t('Contents')}</p>
               </div>
               <ul class={styles.TableOfContentsHeadingsList}>
                 <For each={headings()}>
diff --git a/src/components/Views/EditView/EditView.tsx b/src/components/Views/EditView/EditView.tsx
index 1e8650b1..2148a3e4 100644
--- a/src/components/Views/EditView/EditView.tsx
+++ b/src/components/Views/EditView/EditView.tsx
@@ -2,7 +2,7 @@ import { clsx } from 'clsx'
 import deepEqual from 'fast-deep-equal'
 import { Accessor, Show, createMemo, createSignal, lazy, onCleanup, onMount } from 'solid-js'
 import { createStore } from 'solid-js/store'
-import { throttle } from 'throttle-debounce'
+import { debounce } from 'throttle-debounce'
 
 import { ShoutForm, useEditorContext } from '../../../context/editor'
 import { useLocalize } from '../../../context/localize'
@@ -42,9 +42,8 @@ export const EMPTY_TOPIC: Topic = {
   slug: '',
 }
 
-const THROTTLING_INTERVAL = 2000
-const AUTO_SAVE_INTERVAL = 5000
-const AUTO_SAVE_DELAY = 5000
+const AUTO_SAVE_DELAY = 3000
+
 const handleScrollTopButtonClick = (e) => {
   e.preventDefault()
   window.scrollTo({
@@ -104,6 +103,8 @@ export const EditView = (props: Props) => {
     return JSON.parse(form.media || '[]')
   })
 
+  const [hasChanges, setHasChanges] = createSignal(false)
+
   onMount(() => {
     const handleScroll = () => {
       setIsScrolled(window.scrollY > 0)
@@ -113,7 +114,7 @@ export const EditView = (props: Props) => {
     onCleanup(() => {
       window.removeEventListener('scroll', handleScroll)
     })
-    // eslint-disable-next-line unicorn/consistent-function-scoping
+
     const handleBeforeUnload = (event) => {
       if (!deepEqual(prevForm, form)) {
         event.returnValue = t(
@@ -127,8 +128,8 @@ export const EditView = (props: Props) => {
   })
 
   const handleTitleInputChange = (value: string) => {
-    setForm('title', value)
-    setForm('slug', slugify(value))
+    handleInputChange('title', value)
+    handleInputChange('slug', slugify(value))
     if (value) {
       setFormErrors('title', '')
     }
@@ -136,21 +137,21 @@ export const EditView = (props: Props) => {
 
   const handleAddMedia = (data) => {
     const newMedia = [...mediaItems(), ...data]
-    setForm('media', JSON.stringify(newMedia))
+    handleInputChange('media', JSON.stringify(newMedia))
   }
   const handleSortedMedia = (data) => {
-    setForm('media', JSON.stringify(data))
+    handleInputChange('media', JSON.stringify(data))
   }
 
   const handleMediaDelete = (index) => {
     const copy = [...mediaItems()]
     copy.splice(index, 1)
-    setForm('media', JSON.stringify(copy))
+    handleInputChange('media', JSON.stringify(copy))
   }
 
   const handleMediaChange = (index, value) => {
     const updated = mediaItems().map((item, idx) => (idx === index ? value : item))
-    setForm('media', JSON.stringify(updated))
+    handleInputChange('media', JSON.stringify(updated))
   }
 
   const [baseAudioFields, setBaseAudioFields] = createSignal({
@@ -162,7 +163,7 @@ export const EditView = (props: Props) => {
   const handleBaseFieldsChange = (key, value) => {
     if (mediaItems().length > 0) {
       const updated = mediaItems().map((media) => ({ ...media, [key]: value }))
-      setForm('media', JSON.stringify(updated))
+      handleInputChange('media', JSON.stringify(updated))
     } else {
       setBaseAudioFields({ ...baseAudioFields(), [key]: value })
     }
@@ -182,34 +183,32 @@ export const EditView = (props: Props) => {
     }
   }
 
-  let autoSaveTimeOutId: number | string | NodeJS.Timeout
-
   const autoSave = async () => {
-    const hasChanges = !deepEqual(form, prevForm)
-    const hasTopic = Boolean(form.mainTopic)
-    if (hasChanges || hasTopic) {
+    console.log('autoSave called')
+    if (hasChanges()) {
       console.debug('saving draft', form)
       setSaving(true)
       saveDraftToLocalStorage(form)
       await saveDraft(form)
       setPrevForm(clone(form))
-      setTimeout(() => setSaving(false), AUTO_SAVE_DELAY)
+      setSaving(false)
+      setHasChanges(false)
     }
   }
 
-  // Throttle the autoSave function
-  const throttledAutoSave = throttle(THROTTLING_INTERVAL, autoSave)
+  const debouncedAutoSave = debounce(AUTO_SAVE_DELAY, autoSave)
 
-  const autoSaveRecursive = () => {
-    autoSaveTimeOutId = setTimeout(() => {
-      throttledAutoSave()
-      autoSaveRecursive()
-    }, AUTO_SAVE_INTERVAL)
+  const handleInputChange = (key, value) => {
+    console.log(`[handleInputChange] ${key}: ${value}`)
+    setForm(key, value)
+    setHasChanges(true)
+    debouncedAutoSave()
   }
 
   onMount(() => {
-    autoSaveRecursive()
-    onCleanup(() => clearTimeout(autoSaveTimeOutId))
+    onCleanup(() => {
+      debouncedAutoSave.cancel()
+    })
   })
 
   const showSubtitleInput = () => {
@@ -310,7 +309,7 @@ export const EditView = (props: Props) => {
                                 subtitleInput.current = el
                               }}
                               allowEnterKey={false}
-                              value={(value) => setForm('subtitle', value || '')}
+                              value={(value) => handleInputChange('subtitle', value || '')}
                               class={styles.subtitleInput}
                               placeholder={t('Subheader')}
                               initialValue={form.subtitle || ''}
@@ -324,7 +323,7 @@ export const EditView = (props: Props) => {
                               smallHeight={true}
                               placeholder={t('A short introduction to keep the reader interested')}
                               initialContent={form.lead}
-                              onChange={(value) => setForm('lead', value)}
+                              onChange={(value) => handleInputChange('lead', value)}
                             />
                           </Show>
                         </Show>
@@ -345,7 +344,7 @@ export const EditView = (props: Props) => {
                               }
                               isMultiply={false}
                               fileType={'image'}
-                              onUpload={(val) => setForm('coverImageUrl', val[0].url)}
+                              onUpload={(val) => handleInputChange('coverImageUrl', val[0].url)}
                             />
                           }
                         >
@@ -362,7 +361,7 @@ export const EditView = (props: Props) => {
                                 <div
                                   ref={triggerRef}
                                   class={styles.delete}
-                                  onClick={() => setForm('coverImageUrl', null)}
+                                  onClick={() => handleInputChange('coverImageUrl', null)}
                                 >
                                   <Icon name="close-white" />
                                 </div>
@@ -408,7 +407,7 @@ export const EditView = (props: Props) => {
               <Editor
                 shoutId={form.shoutId}
                 initialContent={form.body}
-                onChange={(body) => setForm('body', body)}
+                onChange={(body) => handleInputChange('body', body)}
               />
             </Show>
           </div>
diff --git a/src/pages/edit.page.tsx b/src/pages/edit.page.tsx
index f729e50b..aaa08eee 100644
--- a/src/pages/edit.page.tsx
+++ b/src/pages/edit.page.tsx
@@ -48,14 +48,18 @@ export const EditPage = () => {
 
   createEffect(
     on(
-      page,
+      () => page(),
       (p) => {
-        const shoutId = p?.path.split('/').pop()
-        const shoutIdFromUrl = Number.parseInt(shoutId ?? '0', 10)
-        console.debug(`editing shout ${shoutIdFromUrl}`)
-        if (shoutIdFromUrl) setShoutId(shoutIdFromUrl)
+        if (p?.path) {
+          console.debug(p?.path)
+          const shoutId = p?.path.split('/').pop()
+          const shoutIdFromUrl = Number.parseInt(shoutId ?? '0', 10)
+          console.debug(`editing shout ${shoutIdFromUrl}`)
+          if (shoutIdFromUrl) {
+            setShoutId(shoutIdFromUrl)
+          }
+        }
       },
-      { defer: true },
     ),
   )
 
@@ -70,6 +74,7 @@ export const EditPage = () => {
         }
       }
     }),
+    { defer: true },
   )
 
   const title = createMemo(() => {