diff --git a/src/components/Nav/AuthModal/EmailConfirm.tsx b/src/components/Nav/AuthModal/EmailConfirm.tsx
index 44065d30..b2b7c1aa 100644
--- a/src/components/Nav/AuthModal/EmailConfirm.tsx
+++ b/src/components/Nav/AuthModal/EmailConfirm.tsx
@@ -28,16 +28,15 @@ export const EmailConfirm = () => {
     }
   })
 
+  createEffect(() => {
+    if (authError()) console.debug('[AuthModal.EmailConfirm] auth error: ', authError())
+  })
+
   return (
     <div>
       <Show when={authError()}>
-        <div class={styles.title}>{authError()}</div>
-        <div class={styles.text}>
-          <a href="/?modal=auth&mode=login">
-            {/*TODO: temp solution, should be send link again */}
-            {t('Enter')}
-          </a>
-        </div>
+        <div class={styles.title}>{t('Error')}</div>
+        <div class={styles.text}>{authError()}</div>
       </Show>
       <Show when={emailConfirmed()}>
         <div class={styles.title}>{t('Hooray! Welcome!')}</div>
diff --git a/src/components/Nav/AuthModal/SocialProviders.module.scss b/src/components/Nav/AuthModal/SocialProviders.module.scss
index ee2e48e8..26605606 100644
--- a/src/components/Nav/AuthModal/SocialProviders.module.scss
+++ b/src/components/Nav/AuthModal/SocialProviders.module.scss
@@ -38,8 +38,13 @@
   a {
     border: none !important;
   }
-
-  .githubAuth:hover {
+  .facebook,
+  .google,
+  .vk,
+  .telegram {
+    border: none;
+  }
+  .github:hover {
     img {
       filter: invert(1);
     }
diff --git a/src/components/Nav/AuthModal/SocialProviders.tsx b/src/components/Nav/AuthModal/SocialProviders.tsx
index 09ea6092..0e0c66c7 100644
--- a/src/components/Nav/AuthModal/SocialProviders.tsx
+++ b/src/components/Nav/AuthModal/SocialProviders.tsx
@@ -1,10 +1,12 @@
+import { For } from 'solid-js'
+
 import { useLocalize } from '../../../context/localize'
 import { useSession } from '../../../context/session'
 import { Icon } from '../../_shared/Icon'
 
 import styles from './SocialProviders.module.scss'
 
-type Provider = 'facebook' | 'google' | 'github' // 'vk' | 'telegram'
+export const PROVIDERS = ['facebook', 'google', 'github'] // 'vk' | 'telegram'
 
 export const SocialProviders = () => {
   const { t } = useLocalize()
@@ -16,15 +18,13 @@ export const SocialProviders = () => {
     <div class={styles.container}>
       <div class={styles.text}>{t('or sign in with social networks')}</div>
       <div class={styles.social}>
-        <a href="#" onClick={(_e) => oauth('google')}>
-          <Icon name={'google'} />
-        </a>
-        <a href="#" onClick={(_e) => oauth('facebook')}>
-          <Icon name={'facebook'} />
-        </a>
-        <a href="#" class={styles.githubAuth} onClick={(_e) => oauth('github')}>
-          <Icon name="github" />
-        </a>
+        <For each={PROVIDERS}>
+          {(provider) => (
+            <a href="#" class={styles[provider]} onClick={(_e) => oauth(provider)}>
+              <Icon name={provider} />
+            </a>
+          )}
+        </For>
       </div>
     </div>
   )
diff --git a/src/components/NotificationsPanel/NotificationView/NotificationGroup.tsx b/src/components/NotificationsPanel/NotificationView/NotificationGroup.tsx
index 85ccd969..ee0f4c87 100644
--- a/src/components/NotificationsPanel/NotificationView/NotificationGroup.tsx
+++ b/src/components/NotificationsPanel/NotificationView/NotificationGroup.tsx
@@ -64,7 +64,7 @@ export const NotificationGroup = (props: NotificationGroupProps) => {
 
   return (
     <>
-      <For each={props.notifications || []}>
+      <For each={props.notifications}>
         {(n: Group) => (
           <>
             {t(reactionsCaption(n.id), { commentsCount: n.reactions.length })}{' '}
diff --git a/src/context/session.tsx b/src/context/session.tsx
index 5c5990bd..3d7b701b 100644
--- a/src/context/session.tsx
+++ b/src/context/session.tsx
@@ -92,12 +92,8 @@ export const SessionProvider = (props: {
   const { searchParams, changeSearchParams } = useRouter()
   const [configuration, setConfig] = createSignal<ConfigType>(defaultConfig)
   const authorizer = createMemo(() => new Authorizer(configuration()))
-
-  createEffect(() => {
-    if (authorizer()) {
-    }
-  })
   const [oauthState, setOauthState] = createSignal<string>()
+
   // handle callback's redirect_uri
   createEffect(async () => {
     // oauth
@@ -109,7 +105,7 @@ export const SessionProvider = (props: {
         : ['openid', 'profile', 'email']
       if (scope) console.info(`[context.session] scope: ${scope}`)
       const url = searchParams()?.redirect_uri || searchParams()?.redirectURL || window.location.href
-      setConfig((c: ConfigType) => ({ ...c, redirectURL: url })) // .split('?')[0]
+      setConfig((c: ConfigType) => ({ ...c, redirectURL: url.split('?')[0] }))
       changeSearchParams({ mode: 'confirm-email', modal: 'auth' }, true)
     }
   })