diff --git a/apps/web/components/Form.tsx b/apps/web/components/Form.tsx
index 76c0bcf..3135b23 100644
--- a/apps/web/components/Form.tsx
+++ b/apps/web/components/Form.tsx
@@ -127,8 +127,8 @@ export const Form = {
 
     if (step === 'telegram') {
       return (
-        <BaseForm onSubmit={(data) => handleLogin(data)}>
-          <button type="button" className={styles['button-telegram']}>
+        <BaseForm onSubmit={() => handleTelegramLogin()}>
+          <button type="submit" className={styles['button-telegram']}>
             <Image
               className={styles['button-telegram-icon']}
               src={TelegramIcon}
@@ -143,7 +143,7 @@ export const Form = {
     }
 
     return (
-      <BaseForm onSubmit={() => handleTelegramLogin()}>
+      <BaseForm onSubmit={(data) => handleLogin(data)}>
         <button className={styles['button-submit']} type="submit">
           Войти
         </button>
diff --git a/apps/web/context/form-state.tsx b/apps/web/context/form-state.tsx
index 7c6aa3c..b0b1a98 100644
--- a/apps/web/context/form-state.tsx
+++ b/apps/web/context/form-state.tsx
@@ -21,6 +21,7 @@ const reducer = (state: State, action: Action): State => {
         return {
           ...state,
           step: action.payload.step,
+          user: action.payload.user || state.user,
         };
 
       return state;