diff --git a/src/components/_shared/CommentEditor/CommentEditor.tsx b/src/components/_shared/CommentEditor/CommentEditor.tsx
index 21175293..ddc30d37 100644
--- a/src/components/_shared/CommentEditor/CommentEditor.tsx
+++ b/src/components/_shared/CommentEditor/CommentEditor.tsx
@@ -81,34 +81,31 @@ const CommentEditor = (props: Props) => {
 
   return (
     <>
-      <div class={styles.commentEditor}>
-        <div
-          class={clsx('ProseMirrorOverrides', styles.textarea)}
-          ref={(el) => (editorElRef.current = el)}
-        />
-        <div class={styles.actions}>
-          <div class={styles.menu} ref={(el) => (menuElRef.current = el)} />
-          <div class={styles.buttons}>
-            <Show when={session()?.user?.slug}>
-              <Button value={t('Send')} variant="primary" onClick={handleSubmitButtonClick} />
-            </Show>
-            <Button value={t('cancel')} variant="secondary" onClick={clearEditor} />
+      <Show
+        when={session()?.user?.slug}
+        fallback={
+          <div class={styles.signInMessage} id="comments">
+            {t('To write a comment, you must')}&nbsp;
+            <a href="?modal=auth&mode=register">{t('sign up')}</a>
+            &nbsp;{t('or')}&nbsp;
+            <a href="?modal=auth&mode=login">{t('sign in')}</a>
+          </div>
+        }
+      >
+        <div class={styles.commentEditor}>
+          <div
+            class={clsx('ProseMirrorOverrides', styles.textarea)}
+            ref={(el) => (editorElRef.current = el)}
+          />
+          <div class={styles.actions}>
+            <div class={styles.menu} ref={(el) => (menuElRef.current = el)} />
+            <div class={styles.buttons}>
+              <Show when={session()?.user?.slug}>
+                <Button value={t('Send')} variant="primary" onClick={handleSubmitButtonClick} />
+              </Show>
+              <Button value={t('cancel')} variant="secondary" onClick={clearEditor} />
+            </div>
           </div>
-        </div>
-      </div>
-      <div class={styles.helpText}>{'"Cmd-Z": Undo, "Cmd-Y": Redo'}</div>
-      <Show when={!session()?.user?.slug}>
-        <div class={styles.signInMessage} id="comments">
-          {t('To write a comment, you must')}&nbsp;
-          <span
-            class={styles.link}
-            onClick={(evt) => {
-              evt.preventDefault()
-              showModal('auth')
-            }}
-          >
-            {t('sign up or sign in')}
-          </span>
         </div>
       </Show>
     </>
diff --git a/src/components/_shared/CommentEditor/styles/CommentEditor.module.scss b/src/components/_shared/CommentEditor/styles/CommentEditor.module.scss
index 6fad818e..040c0eed 100644
--- a/src/components/_shared/CommentEditor/styles/CommentEditor.module.scss
+++ b/src/components/_shared/CommentEditor/styles/CommentEditor.module.scss
@@ -25,13 +25,6 @@
   }
 }
 
-.helpText {
-  font-size: 12px;
-  color: #696969;
-  margin: 12px 0;
-  font-style: italic;
-}
-
 .signInMessage {
   background: #f1f2f3;
   border-radius: 8px;
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 45b5d281..01a6060e 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -179,7 +179,9 @@
   "personal data usage and email notifications": "на обработку персональных данных и на получение почтовых уведомлений",
   "post": "пост",
   "register": "зарегистрируйтесь",
-  "sign up or sign in": "зарегистрироваться или войти",
+  "sign up": "зарегистрироваться",
+  "or": "или",
+  "sign in": "войти",
   "terms of use": "правилами пользования сайтом",
   "topics": "темы",
   "user already exist": "пользователь уже существует",