diff --git a/src/components/Author/AuthorCard/AuthorCard.tsx b/src/components/Author/AuthorCard/AuthorCard.tsx
index 17f25a17..e930a60e 100644
--- a/src/components/Author/AuthorCard/AuthorCard.tsx
+++ b/src/components/Author/AuthorCard/AuthorCard.tsx
@@ -311,7 +311,7 @@ export const AuthorCard = (props: Props) => {
                           <TopicBadge
                             isFollowed={{
                               loaded: Boolean(authorSubs()),
-                              value: isOwnerSubscribed(subscription.id),
+                              value: isOwnerSubscribed(subscription.id)
                             }}
                             topic={subscription}
                           />
diff --git a/src/components/Editor/Editor.tsx b/src/components/Editor/Editor.tsx
index 7472fe9e..11ddc310 100644
--- a/src/components/Editor/Editor.tsx
+++ b/src/components/Editor/Editor.tsx
@@ -93,7 +93,7 @@ export const Editor = (props: Props) => {
       url: 'wss://hocuspocus.discours.io',
       name: docName,
       document: yDocs[docName],
-      token: session()?.access_token || '',
+      token: session()?.access_token || ''
     })
   }
 
diff --git a/src/components/Nav/AuthModal/LoginForm.tsx b/src/components/Nav/AuthModal/LoginForm.tsx
index c5f9e34c..e5c9c7fb 100644
--- a/src/components/Nav/AuthModal/LoginForm.tsx
+++ b/src/components/Nav/AuthModal/LoginForm.tsx
@@ -171,7 +171,7 @@ export const LoginForm = () => {
             class="link"
             onClick={() =>
               changeSearchParams({
-                mode: 'send-reset-link',
+                mode: 'send-reset-link'
               })
             }
           >
diff --git a/src/components/Nav/AuthModal/RegisterForm.tsx b/src/components/Nav/AuthModal/RegisterForm.tsx
index fd3b2467..7a8244e9 100644
--- a/src/components/Nav/AuthModal/RegisterForm.tsx
+++ b/src/components/Nav/AuthModal/RegisterForm.tsx
@@ -99,7 +99,7 @@ export const RegisterForm = () => {
         email: cleanEmail,
         password: password(),
         confirm_password: password(),
-        redirect_uri: window.location.origin,
+        redirect_uri: window.location.origin
       }
       const { errors } = await signUp(opts)
       if (errors) return
@@ -114,7 +114,7 @@ export const RegisterForm = () => {
   const handleResendLink = async (_ev) => {
     const response: GenericResponse = await resendVerifyEmail({
       email: email(),
-      identifier: 'basic_signup',
+      identifier: 'basic_signup'
     })
     setIsSuccess(response?.message === 'Verification email has been sent. Please check your inbox')
   }
@@ -131,7 +131,7 @@ export const RegisterForm = () => {
                 {t('resend confirmation link')}
               </span>
             </>
-          ),
+          )
         }))
         break
 
@@ -144,7 +144,7 @@ export const RegisterForm = () => {
                 {t('enter')}
               </span>
             </>
-          ),
+          )
         }))
         break
       case 'registered':
@@ -157,7 +157,7 @@ export const RegisterForm = () => {
                 {t('Set the new password').toLocaleLowerCase()}
               </span>
             </>
-          ),
+          )
         }))
         break
       default:
@@ -187,7 +187,7 @@ export const RegisterForm = () => {
             </Show>
             <div
               class={clsx('pretty-form__item', {
-                'pretty-form__item--error': validationErrors().fullName,
+                'pretty-form__item--error': validationErrors().fullName
               })}
             >
               <input
@@ -206,7 +206,7 @@ export const RegisterForm = () => {
 
             <div
               class={clsx('pretty-form__item', {
-                'pretty-form__item--error': validationErrors().email && !emailStatus(),
+                'pretty-form__item--error': validationErrors().email && !emailStatus()
               })}
             >
               <input
@@ -250,7 +250,7 @@ export const RegisterForm = () => {
                 class={styles.authLink}
                 onClick={() =>
                   changeSearchParams({
-                    mode: 'login',
+                    mode: 'login'
                   })
                 }
               >
diff --git a/src/components/Nav/HeaderAuth.tsx b/src/components/Nav/HeaderAuth.tsx
index 8aab146b..226e88b2 100644
--- a/src/components/Nav/HeaderAuth.tsx
+++ b/src/components/Nav/HeaderAuth.tsx
@@ -155,7 +155,7 @@ export const HeaderAuth = (props: Props) => {
                 {renderIconedButton({
                   value: t('Publish'),
                   icon: 'publish',
-                  action: () => publishShout(form),
+                  action: () => publishShout(form)
                 })}
               </div>
 
diff --git a/src/components/Topic/TopicBadge/TopicBadge.tsx b/src/components/Topic/TopicBadge/TopicBadge.tsx
index a4ccd348..193f7a82 100644
--- a/src/components/Topic/TopicBadge/TopicBadge.tsx
+++ b/src/components/Topic/TopicBadge/TopicBadge.tsx
@@ -46,8 +46,8 @@ export const TopicBadge = (props: Props) => {
       () => props.isFollowed,
       () => {
         setIsFollowed(props.isFollowed.value)
-      },
-    ),
+      }
+    )
   )
 
   const title = () =>
@@ -61,11 +61,11 @@ export const TopicBadge = (props: Props) => {
             href={`/topic/${props.topic.slug}`}
             class={clsx(styles.picture, {
               [styles.withImage]: props.topic.pic,
-              [styles.smallSize]: isMobileView(),
+              [styles.smallSize]: isMobileView()
             })}
             style={
               props.topic.pic && {
-                'background-image': `url('${getImageUrl(props.topic.pic, { width: 40, height: 40 })}')`,
+                'background-image': `url('${getImageUrl(props.topic.pic, { width: 40, height: 40 })}')`
               }
             }
           />
diff --git a/src/components/Views/AllTopics/AllTopics.tsx b/src/components/Views/AllTopics/AllTopics.tsx
index f56dca03..f9c64df4 100644
--- a/src/components/Views/AllTopics/AllTopics.tsx
+++ b/src/components/Views/AllTopics/AllTopics.tsx
@@ -193,7 +193,7 @@ export const AllTopics = (props: Props) => {
                             topic={topic}
                             isFollowed={{
                               loaded: filteredResults().length > 0,
-                              value: isOwnerSubscribed(topic.slug),
+                              value: isOwnerSubscribed(topic.slug)
                             }}
                             showStat={true}
                           />
diff --git a/src/context/session.tsx b/src/context/session.tsx
index ecd205c4..10b1f83c 100644
--- a/src/context/session.tsx
+++ b/src/context/session.tsx
@@ -327,7 +327,7 @@ export const SessionProvider = (props: {
     console.debug('[context.session] calling is_registered for ', email)
     try {
       const response = await authorizer().graphqlQuery({
-        query: `query { is_registered(email: "${email}") { message }}`,
+        query: `query { is_registered(email: "${email}") { message }}`
       })
       // console.log(response)
       return response?.data?.is_registered?.message
@@ -376,7 +376,7 @@ export const SessionProvider = (props: {
     forgotPassword,
     changePassword,
     oauth,
-    isRegistered,
+    isRegistered
   }
   const value: SessionContextType = {
     authError,
@@ -386,7 +386,7 @@ export const SessionProvider = (props: {
     author,
     ...actions,
     isAuthenticated,
-    resendVerifyEmail,
+    resendVerifyEmail
   }
 
   return <SessionContext.Provider value={value}>{props.children}</SessionContext.Provider>
diff --git a/templates/entries/password_reset.html b/templates/entries/password_reset.html
index 416a3e46..ada6bce0 100644
--- a/templates/entries/password_reset.html
+++ b/templates/entries/password_reset.html
@@ -8,7 +8,7 @@
                               font-family: Helvetica, Arial, sans-serif;
                               font-size: 24px;
                             ">
-          {{username}}, здравствуйте!
+          Приветствуем!
         </span>
       </h1>
     </td>
@@ -27,10 +27,10 @@
         </p>
 
         <p style="margin: 15px 0">
-          Чтобы сменить пароль для входа в Дискурс, перейдите по
+          Чтобы задать пароль для входа в Дискурс, перейдите по
           <a href="{{verification_url}}" style="color: #2638d9; font-weight: bold">
             этой ссылке</a>. Она сработает всего один раз и приведет вас на страницу, где вы сможете
-          установить новый пароль.
+          задать новый пароль.
         </p>
 
         <p style="margin: 15px 0">
@@ -83,4 +83,4 @@
       </table>
     </td>
   </tr>
-</tbody>
\ No newline at end of file
+</tbody>