diff --git a/veterans/app/api/sendEmail/route.test.ts b/veterans/app/api/sendEmail/route.test.ts
index 44c4f023..9574729f 100644
--- a/veterans/app/api/sendEmail/route.test.ts
+++ b/veterans/app/api/sendEmail/route.test.ts
@@ -1,9 +1,17 @@
+jest.mock('nodemailer', () => ({
+  createTransport: jest.fn().mockReturnValue({
+    sendMail: jest.fn().mockResolvedValue({ messageId: 'test-id' }),
+  }),
+}));
+
 jest.mock('next/server', () => ({
   NextResponse: {
-    json: jest.fn().mockImplementation((body, { status }) => ({
-      status,
-      json: async () => body,
-    })),
+    json: jest.fn().mockImplementation((body, { status }) => {
+      return new Response(JSON.stringify(body), {
+        status,
+        headers: { 'Content-Type': 'application/json' },
+      });
+    }),
   },
 }));
 
@@ -14,12 +22,6 @@ describe('POST /api/sendEmail', () => {
   });
 
   it('should return error if "to" is missing', async () => {
-    jest.doMock('resend', () => ({
-      Resend: jest.fn(() => ({
-        emails: { send: jest.fn() },
-      })),
-    }));
-
     const { POST } = await import('./route');
     const req = {
       json: jest.fn().mockResolvedValue({ to: '', message: 'Hello' }),
@@ -33,12 +35,6 @@ describe('POST /api/sendEmail', () => {
   });
 
   it('should send an email successfully and return a success response', async () => {
-    jest.doMock('resend', () => ({
-      Resend: jest.fn(() => ({
-        emails: { send: jest.fn().mockResolvedValue({ status: 'success' }) },
-      })),
-    }));
-
     const { POST } = await import('./route');
     const req = {
       json: jest
@@ -51,35 +47,26 @@ describe('POST /api/sendEmail', () => {
 
     expect(response.status).toBe(200);
     expect(jsonResponse.message).toBe('Email sent successfully!');
+    expect(jsonResponse.response).toHaveProperty('messageId', 'test-id');
   });
 
-  describe('Error Handling', () => {
-    beforeEach(() => {
-      jest.resetModules();
-      jest.clearAllMocks();
+  it('should return a 500 error if sending email fails', async () => {
+    const nodemailer = await import('nodemailer');
+    (nodemailer.createTransport as jest.Mock).mockReturnValueOnce({
+      sendMail: jest.fn().mockRejectedValue(new Error('Test error message')),
     });
 
-    it('should return a 500 error if sending email fails', async () => {
-      jest.doMock('resend', () => ({
-        Resend: jest.fn(() => ({
-          emails: {
-            send: jest.fn().mockRejectedValue(new Error('Test error message')),
-          },
-        })),
-      }));
-
-      const { POST } = await import('./route');
-      const req = {
-        json: jest
-          .fn()
-          .mockResolvedValue({ to: 'test@example.com', message: 'Hello' }),
-      } as unknown as Request;
+    const { POST } = await import('./route');
+    const req = {
+      json: jest
+        .fn()
+        .mockResolvedValue({ to: 'test@example.com', message: 'Hello' }),
+    } as unknown as Request;
 
-      const response = await POST(req);
-      const jsonResponse = await response.json();
+    const response = await POST(req);
+    const jsonResponse = await response.json();
 
-      expect(response.status).toBe(500);
-      expect(jsonResponse.error).toBe('Test error message');
-    });
+    expect(response.status).toBe(500);
+    expect(jsonResponse.error).toBe('Test error message');
   });
 });
diff --git a/veterans/app/api/sendEmail/route.ts b/veterans/app/api/sendEmail/route.ts
index c21dc15d..5294338d 100644
--- a/veterans/app/api/sendEmail/route.ts
+++ b/veterans/app/api/sendEmail/route.ts
@@ -1,7 +1,5 @@
 import { NextResponse } from 'next/server';
-import { Resend } from 'resend';
-
-const resend = new Resend(process.env.RESEND_API_KEY);
+import nodemailer from 'nodemailer';
 
 export async function POST(req: Request) {
   const { to, message } = await req.json();
@@ -14,13 +12,25 @@ export async function POST(req: Request) {
   }
 
   try {
-    const response = await resend.emails.send({
-      from: 'RAZOM <onboarding@resend.dev>',
-      to: [to],
-      subject: 'Your Verification Code',
-      text: message,
+    const transporter = nodemailer.createTransport({
+      service: 'gmail',
+      port: 465,
+      secure: true,
+      auth: {
+        user: process.env.GMAIL_USER,
+        pass: process.env.GMAIL_PASSWORD,
+      },
     });
 
+    const mailOptions = {
+      from: process.env.GMAIL_USER,
+      to,
+      subject: 'Verify Your Email Address',
+      text: message,
+    };
+
+    const response = await transporter.sendMail(mailOptions);
+
     return NextResponse.json(
       { message: 'Email sent successfully!', response },
       { status: 200 },
diff --git a/veterans/app/layout.tsx b/veterans/app/layout.tsx
index 60f370c2..fecb8958 100644
--- a/veterans/app/layout.tsx
+++ b/veterans/app/layout.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { Toaster } from 'react-hot-toast';
 import { Lato, Golos_Text } from 'next/font/google';
 
 import 'styles/global.css';
@@ -51,6 +52,7 @@ export default function RootLayout({
                 <Banner name="logotype" height={34} />
               </HeaderContent>
             </Header>
+            <Toaster position="top-center" />
             <main>{children}</main>
             <Footer>
               <FooterContent>
diff --git a/veterans/auth.ts b/veterans/auth.ts
index f2ed50c6..b24e167f 100644
--- a/veterans/auth.ts
+++ b/veterans/auth.ts
@@ -17,9 +17,16 @@ const { withAuth } = createAuth({
 
 const sessionMaxAge = 60 * 60 * 24 * 30;
 
+const isSecureEnv =
+  process.env.NODE_ENV === 'production' ||
+  process.env.VERCEL_ENV === 'preview' ||
+  process.env.VERCEL_ENV === 'staging';
+
 const session = statelessSessions({
   maxAge: sessionMaxAge,
   secret: process.env.SESSION_SECRET,
+  sameSite: isSecureEnv ? 'none' : 'lax',
+  secure: isSecureEnv,
 });
 
 export { withAuth, session };
diff --git a/veterans/components/common/authForm/EmailVerification/EmailVerification.test.tsx b/veterans/components/common/authForm/EmailVerification/EmailVerification.test.tsx
new file mode 100644
index 00000000..51f4e218
--- /dev/null
+++ b/veterans/components/common/authForm/EmailVerification/EmailVerification.test.tsx
@@ -0,0 +1,132 @@
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { useMutation, useQuery } from '@apollo/client';
+import { useRouter } from 'next/navigation';
+import { toast } from 'react-hot-toast';
+import EmailVerification from './EmailVerification';
+
+jest.mock('@apollo/client');
+jest.mock('next/navigation');
+jest.mock('react-hot-toast', () => ({
+  toast: {
+    error: jest.fn(),
+  },
+}));
+
+describe('EmailVerification', () => {
+  const mockRouterPush = jest.fn();
+  const mockUseQuery = useQuery as jest.Mock;
+  const mockUseMutation = useMutation as jest.Mock;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    (useRouter as jest.Mock).mockReturnValue({
+      push: mockRouterPush,
+    });
+
+    mockUseQuery.mockReturnValue({
+      data: { user: { id: '1' } },
+    });
+
+    mockUseMutation.mockReturnValue([jest.fn()]);
+  });
+
+  it('renders the component correctly', () => {
+    render(
+      <EmailVerification verificationCode="1234" email="test@example.com" />,
+    );
+
+    expect(
+      screen.getByPlaceholderText('Verification code'),
+    ).toBeInTheDocument();
+    expect(screen.getByText('Verify your email address')).toBeInTheDocument();
+  });
+
+  it('handles invalid verification code', async () => {
+    render(
+      <EmailVerification verificationCode="1234" email="test@example.com" />,
+    );
+
+    fireEvent.change(screen.getByPlaceholderText('Verification code'), {
+      target: { value: 'wrong-code' },
+    });
+
+    fireEvent.click(screen.getByText('Ok'));
+
+    await waitFor(() =>
+      expect(toast.error).toHaveBeenCalledWith('Invalid verification code'),
+    );
+  });
+
+  it('successfully verifies the email and redirects', async () => {
+    const mockUpdateUserVerification = jest.fn().mockResolvedValue({
+      data: {
+        updateUser: { isVerified: true },
+      },
+    });
+    mockUseMutation.mockReturnValue([mockUpdateUserVerification]);
+
+    render(
+      <EmailVerification verificationCode="1234" email="test@example.com" />,
+    );
+
+    fireEvent.change(screen.getByPlaceholderText('Verification code'), {
+      target: { value: '1234' },
+    });
+
+    fireEvent.click(screen.getByText('Ok'));
+
+    await waitFor(() =>
+      expect(mockUpdateUserVerification).toHaveBeenCalledWith({
+        variables: { id: '1', isVerified: true },
+      }),
+    );
+
+    expect(mockRouterPush).toHaveBeenCalledWith('/');
+  });
+
+  it('handles failed verification', async () => {
+    const mockUpdateUserVerification = jest.fn().mockResolvedValue({
+      data: {
+        updateUser: { isVerified: false },
+      },
+    });
+    mockUseMutation.mockReturnValue([mockUpdateUserVerification]);
+
+    render(
+      <EmailVerification verificationCode="1234" email="test@example.com" />,
+    );
+
+    fireEvent.change(screen.getByPlaceholderText('Verification code'), {
+      target: { value: '1234' },
+    });
+
+    fireEvent.click(screen.getByText('Ok'));
+
+    await waitFor(() =>
+      expect(toast.error).toHaveBeenCalledWith('Verification failed'),
+    );
+  });
+
+  it('handles mutation error', async () => {
+    const mockUpdateUserVerification = jest
+      .fn()
+      .mockRejectedValue(new Error('Network error'));
+    mockUseMutation.mockReturnValue([mockUpdateUserVerification]);
+
+    render(
+      <EmailVerification verificationCode="1234" email="test@example.com" />,
+    );
+
+    fireEvent.change(screen.getByPlaceholderText('Verification code'), {
+      target: { value: '1234' },
+    });
+
+    fireEvent.click(screen.getByText('Ok'));
+
+    await waitFor(() =>
+      expect(toast.error).toHaveBeenCalledWith('Network error'),
+    );
+  });
+});
diff --git a/veterans/components/common/authForm/EmailVerification/EmailVerification.tsx b/veterans/components/common/authForm/EmailVerification/EmailVerification.tsx
index 7662dc02..4dff93ec 100644
--- a/veterans/components/common/authForm/EmailVerification/EmailVerification.tsx
+++ b/veterans/components/common/authForm/EmailVerification/EmailVerification.tsx
@@ -1,23 +1,54 @@
 import React, { useState } from 'react';
+import { toast } from 'react-hot-toast';
+import { useMutation, useQuery } from '@apollo/client';
 import { useRouter } from 'next/navigation';
 import st from '@comComps/authForm/AuthForm.module.css';
+import { VERIFICATION_MUTATION, CHECK_USER_QUERY } from 'constants/graphql';
 
 interface EmailVerificationProps {
   readonly verificationCode: string;
+  readonly email: string;
 }
 
 export default function EmailVerification({
   verificationCode,
+  email,
 }: EmailVerificationProps) {
   const [confirmedCode, setConfirmedCode] = useState<string>('');
+  const [updateUserVerification] = useMutation(VERIFICATION_MUTATION);
   const router = useRouter();
+  const { data: userData } = useQuery(CHECK_USER_QUERY, {
+    variables: { email },
+  });
 
-  const handleVerifyCode = () => {
-    if (confirmedCode === verificationCode) {
-      router.push('/login');
-    } else {
-      // eslint-disable-next-line no-alert
-      alert('Invalid verification code');
+  const handleVerifyCode = async () => {
+    if (confirmedCode !== verificationCode) {
+      toast.error('Invalid verification code');
+      return;
+    }
+
+    const userId = userData.user.id;
+
+    try {
+      const { data } = await updateUserVerification({
+        variables: {
+          id: userId,
+          isVerified: true,
+        },
+      });
+
+      if (data?.updateUser?.isVerified) {
+        router.push('/');
+      } else {
+        toast.error('Verification failed');
+      }
+    } catch (error: unknown) {
+      let message = 'Something went wrong during verification';
+
+      if (error instanceof Error) {
+        message = error.message;
+      }
+      toast.error(message);
     }
   };
 
@@ -28,7 +59,7 @@ export default function EmailVerification({
       <input
         type="text"
         id="confirmEmail"
-        placeholder="Email verification"
+        placeholder="Verification code"
         className={st.input}
         style={{ textAlign: 'center' }}
         value={confirmedCode}
diff --git a/veterans/components/common/authForm/LoginForm.test.tsx b/veterans/components/common/authForm/LoginForm.test.tsx
index a543f902..54453fad 100644
--- a/veterans/components/common/authForm/LoginForm.test.tsx
+++ b/veterans/components/common/authForm/LoginForm.test.tsx
@@ -18,69 +18,72 @@ import {
   REGISTER_MUTATION,
 } from 'constants/graphql';
 
-const loginMock: MockedResponse[] = [
-  {
-    request: {
-      query: LOGIN_MUTATION,
-      variables: {
-        email: 'test@example.com',
-        password: 'Password123',
+const mocks = {
+  login: [
+    {
+      request: {
+        query: LOGIN_MUTATION,
+        variables: {
+          email: 'test@example.com',
+          password: process.env.SESSION_SECRET,
+        },
       },
-    },
-    result: {
-      data: {
-        authenticateUserWithPassword: {
-          item: {
-            id: '1',
-            email: 'test@example.com',
-            role: 'USER',
-            name: 'Test User',
+      result: {
+        data: {
+          authenticateUserWithPassword: {
+            item: {
+              id: '1',
+              email: 'test@example.com',
+              role: 'USER',
+              name: 'Test User',
+              isVerified: true,
+            },
           },
         },
       },
     },
-  },
-];
-
-const logoutMock: MockedResponse[] = [
-  {
-    request: {
-      query: LOGOUT_MUTATION,
+  ],
+  logout: [
+    {
+      request: { query: LOGOUT_MUTATION },
+      result: { data: { endSession: true } },
     },
-    result: { data: { endSession: true } },
-  },
-];
-
-const loginErrorMock: MockedResponse[] = [
-  {
-    request: {
-      query: LOGIN_MUTATION,
-      variables: { email: 'wrong@example.com', password: 'WrongPassword' },
+  ],
+  loginError: [
+    {
+      request: {
+        query: LOGIN_MUTATION,
+        variables: {
+          email: 'wrong@example.com',
+          password: process.env.SESSION_SECRET,
+        },
+      },
+      error: new Error('Invalid credentials'),
     },
-    error: new Error('Invalid credentials'),
-  },
-];
-
-const oauthMock: MockedResponse[] = [
-  {
-    request: {
-      query: CHECK_USER_QUERY,
-      variables: { email: 'oauth@example.com' },
+  ],
+  oauth: [
+    {
+      request: {
+        query: CHECK_USER_QUERY,
+        variables: { email: 'oauth@example.com' },
+      },
+      result: { data: { user: null } },
     },
-    result: { data: { user: null } },
-  },
-  {
-    request: {
-      query: REGISTER_MUTATION,
-      variables: {
-        name: 'OAuth User',
-        email: 'oauth@example.com',
-        password: 'withoutpassword',
+    {
+      request: {
+        query: REGISTER_MUTATION,
+        variables: {
+          name: 'OAuth User',
+          email: 'oauth@example.com',
+          password: process.env.SESSION_SECRET,
+        },
+      },
+      result: {
+        data: { createUser: { id: '456', email: 'oauth@example.com' } },
       },
     },
-    result: { data: { createUser: { id: '456', email: 'oauth@example.com' } } },
-  },
-];
+  ],
+};
 
 const AllProviders: React.FC<{
   children: React.ReactNode;
@@ -105,6 +108,17 @@ const customRender = (
     ...options,
   });
 
+const fillAndSubmitLoginForm = async (email: string, password: string) => {
+  fireEvent.change(screen.getByPlaceholderText('Email'), {
+    target: { value: email },
+  });
+  fireEvent.change(screen.getByPlaceholderText('Password'), {
+    target: { value: password },
+  });
+  fireEvent.click(screen.getByRole('button', { name: /sign in/i }));
+  await waitFor(() => screen.getByRole('button', { name: /sign in/i }));
+};
+
 jest.mock('next/navigation', () => ({
   useRouter: jest.fn(),
 }));
@@ -131,7 +145,7 @@ describe('Auth Forms', () => {
     ).toBeInTheDocument();
   });
 
-  it('should display OAuth login button', async () => {
+  it('should display OAuth login button', () => {
     customRender(<LoginForm />);
     expect(
       screen.getByRole('button', { name: /Увійти через Google/i }),
@@ -145,117 +159,128 @@ describe('Auth Forms', () => {
     expect(await screen.findByText('Password is required')).toBeInTheDocument();
   });
 
-  it('should display error if email field is empty', async () => {
-    customRender(<LoginForm />);
-    fireEvent.change(screen.getByPlaceholderText('Password'), {
-      target: { value: 'Password123' },
-    });
-    fireEvent.click(screen.getByRole('button', { name: /sign in/i }));
-    expect(await screen.findByText('Email is required')).toBeInTheDocument();
+  it('should log in successfully with valid credentials and redirect to homepage', async () => {
+    customRender(<LoginForm />, [...mocks.login, ...mocks.logout]);
+    await fillAndSubmitLoginForm(
+      'test@example.com',
+      process.env.SESSION_SECRET ?? '',
+    );
+    await waitFor(() => expect(mockPush).toHaveBeenCalledWith('/'));
   });
 
-  it('should display error if password field is empty', async () => {
-    customRender(<LoginForm />);
-    fireEvent.change(screen.getByPlaceholderText('Email'), {
-      target: { value: 'test@example.com' },
-    });
-    fireEvent.click(screen.getByRole('button', { name: /sign in/i }));
-    expect(await screen.findByText('Password is required')).toBeInTheDocument();
+  it('should handle login errors correctly', async () => {
+    customRender(<LoginForm />, mocks.loginError);
+    await fillAndSubmitLoginForm(
+      'wrong@example.com',
+      process.env.SESSION_SECRET ?? '',
+    );
+    await waitFor(() =>
+      expect(screen.getByText('Invalid credentials')).toBeInTheDocument(),
+    );
   });
 
-  it('should clear error messages upon correcting input', async () => {
-    customRender(<LoginForm />);
-    fireEvent.click(screen.getByRole('button', { name: /sign in/i }));
-    fireEvent.change(screen.getByPlaceholderText('Email'), {
-      target: { value: 'john.doe@example.com' },
-    });
-    await waitFor(() => {
-      expect(screen.queryByText('Email is required')).not.toBeInTheDocument();
-    });
+  it('should handle OAuth authentication and redirect to home', async () => {
+    customRender(<LoginForm />, mocks.oauth);
+    await waitFor(() => expect(mockPush).toHaveBeenCalledWith('/'));
   });
 
-  it('should log in successfully with valid credentials and redirect to homepage', async () => {
-    customRender(<LoginForm />, [...loginMock, ...logoutMock]);
-    fireEvent.change(screen.getByPlaceholderText('Email'), {
-      target: { value: 'test@example.com' },
-    });
-    fireEvent.change(screen.getByPlaceholderText('Password'), {
-      target: { value: 'Password123' },
-    });
-    fireEvent.click(screen.getByRole('button', { name: /sign in/i }));
-    await waitFor(() => {
-      expect(mockPush).toHaveBeenCalledWith('/');
-    });
-  });
+  it('should show error if network is down during login', async () => {
+    const networkErrorMock = [
+      {
+        request: {
+          query: LOGIN_MUTATION,
+          variables: {
+            email: 'test@example.com',
+            password: process.env.SESSION_SECRET,
+          },
+        },
+        error: new Error('Network error'),
+      },
+    ];
 
-  it('should handle login errors correctly', async () => {
-    customRender(<LoginForm />, loginErrorMock);
-    fireEvent.change(screen.getByPlaceholderText('Email'), {
-      target: { value: 'wrong@example.com' },
-    });
-    fireEvent.change(screen.getByPlaceholderText('Password'), {
-      target: { value: 'WrongPassword' },
-    });
-    fireEvent.click(screen.getByRole('button', { name: /sign in/i }));
-    await waitFor(() => {
-      expect(screen.getByText('Invalid credentials')).toBeInTheDocument();
-    });
+    customRender(<LoginForm />, networkErrorMock);
+    await fillAndSubmitLoginForm(
+      'test@example.com',
+      process.env.SESSION_SECRET ?? '',
+    );
+    await waitFor(() =>
+      expect(screen.getByText('Network error')).toBeInTheDocument(),
+    );
   });
 
-  it('should handle OAuth authentication and redirect to home', async () => {
-    customRender(<LoginForm />, oauthMock);
-    await waitFor(() => {
-      expect(mockPush).toHaveBeenCalledWith('/');
-    });
-  });
+  it('should display submit error message when login fails after registration', async () => {
+    const submitErrorMock = 'Login failed after registration';
 
-  it('should handle OAuth authentication for an existing user', async () => {
-    const existingUserMock: MockedResponse[] = [
+    const mocksWithError = [
       {
         request: {
-          query: CHECK_USER_QUERY,
-          variables: { email: 'existing@example.com' },
+          query: LOGIN_MUTATION,
+          variables: {
+            email: 'test@example.com',
+            password: process.env.SESSION_SECRET,
+          },
         },
         result: {
           data: {
-            user: {
-              id: '123',
-              email: 'existing@example.com',
-              name: 'Existing User',
+            authenticateUserWithPassword: {
+              message: submitErrorMock,
             },
           },
         },
       },
     ];
 
-    customRender(<LoginForm />, existingUserMock);
-    await waitFor(() => {
-      expect(mockPush).toHaveBeenCalledWith('/');
-    });
+    customRender(<LoginForm />, mocksWithError);
+    await fillAndSubmitLoginForm(
+      'test@example.com',
+      process.env.SESSION_SECRET ?? '',
+    );
+    await waitFor(() =>
+      expect(screen.getByText(submitErrorMock)).toBeInTheDocument(),
+    );
   });
 
-  it('should show an error message if the network is down during login', async () => {
-    const networkErrorMock: MockedResponse[] = [
+  it('should render EmailVerification component when user is not verified', async () => {
+    const testEmail = 'unverified@example.com';
+
+    const mocksWithUnverifiedUser = [
       {
         request: {
           query: LOGIN_MUTATION,
-          variables: { email: 'test@example.com', password: 'Password123' },
+          variables: {
+            email: testEmail,
+            password: process.env.SESSION_SECRET,
+          },
+        },
+        result: {
+          data: {
+            authenticateUserWithPassword: {
+              item: {
+                id: '1',
+                email: testEmail,
+                name: 'Unverified User',
+                role: 'USER',
+                isVerified: false,
+              },
+            },
+          },
         },
-        error: new Error('Network error'),
       },
     ];
 
-    customRender(<LoginForm />, networkErrorMock);
-    fireEvent.change(screen.getByPlaceholderText('Email'), {
-      target: { value: 'test@example.com' },
-    });
-    fireEvent.change(screen.getByPlaceholderText('Password'), {
-      target: { value: 'Password123' },
-    });
-    fireEvent.click(screen.getByRole('button', { name: /sign in/i }));
+    jest.mock('@helpers/handleSendEmail', () => ({
+      handleSendEmail: jest.fn(() =>
+        Promise.resolve({ success: true, code: '123456' }),
+      ),
+    }));
 
-    await waitFor(() => {
-      expect(screen.getByText('Network error')).toBeInTheDocument();
-    });
+    customRender(<LoginForm />, mocksWithUnverifiedUser);
+    await fillAndSubmitLoginForm(testEmail, process.env.SESSION_SECRET ?? '');
+
+    await waitFor(() =>
+      expect(
+        screen.getByText(/verify your email address/i),
+      ).toBeInTheDocument(),
+    );
   });
 });
diff --git a/veterans/components/common/authForm/LoginForm.tsx b/veterans/components/common/authForm/LoginForm.tsx
index 27ccd7d3..abf0a3fe 100644
--- a/veterans/components/common/authForm/LoginForm.tsx
+++ b/veterans/components/common/authForm/LoginForm.tsx
@@ -17,6 +17,8 @@ import { useApolloClient, useMutation } from '@apollo/client';
 import { useRouter } from 'next/navigation';
 import LoginAuthButton from './LoginAuthButton';
 import { useSession } from 'next-auth/react';
+import { handleSendEmail } from '@helpers/handleSendEmail';
+import EmailVerification from './EmailVerification/EmailVerification';
 
 const loginSchema = yup.object().shape({
   email: yup
@@ -30,6 +32,7 @@ export default function LoginForm() {
   const {
     control,
     handleSubmit,
+    getValues,
     formState: { errors },
   } = useForm({
     resolver: yupResolver(loginSchema),
@@ -38,6 +41,9 @@ export default function LoginForm() {
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [submitError, setSubmitError] = useState<string | null>(null);
   const [error, setError] = useState<string | null>(null);
+  const verificationCode = useRef<string>('');
+  const stepRef = useRef<'login' | 'verify'>('login');
+  const emailRef = useRef<string>('');
   const client = useApolloClient();
   const router = useRouter();
   const { data: session } = useSession();
@@ -51,9 +57,8 @@ export default function LoginForm() {
           query: CURRENT_USER_QUERY,
           data: { authenticatedItem: authResult.item },
         });
-        router.push('/');
       } else {
-        setError(authResult?.message || 'Невідома помилка входу');
+        setError(authResult?.message ?? 'Невідома помилка входу');
       }
     },
     onError(err) {
@@ -121,8 +126,29 @@ export default function LoginForm() {
     setError(null);
     setSubmitError(null);
     setIsSubmitting(true);
+
     try {
-      await login({ variables: formData });
+      const { data } = await login({ variables: formData });
+      const authResult = data?.authenticateUserWithPassword;
+
+      if (authResult && 'item' in authResult) {
+        const isVerified = authResult.item?.isVerified;
+        const userEmail = getValues('email');
+        emailRef.current = userEmail;
+
+        if (!isVerified) {
+          stepRef.current = 'verify';
+
+          const { success, code } = await handleSendEmail(userEmail);
+          if (success && code) {
+            verificationCode.current = code;
+          } else {
+            setError('Failed to send verification email');
+          }
+        } else {
+          router.push('/');
+        }
+      }
     } catch (error) {
       setSubmitError(
         error instanceof Error ? error.message : 'An error occurred',
@@ -134,86 +160,93 @@ export default function LoginForm() {
 
   return (
     <div className={st.container}>
-      <form className={st.form} onSubmit={handleSubmit(onSubmit)}>
-        {submitError && (
-          <p className={st.error} role="alert">
-            {submitError}
-          </p>
-        )}
-        <div className={st.header}>
-          {isSubmitting ? <h1>Signing in...</h1> : <h1>Sign in</h1>}
-        </div>
-
-        <div className={st['input-group']}>
-          <label htmlFor="email" className={st.label}>
-            Email
-          </label>
-          <Controller
-            control={control}
-            name="email"
-            render={({ field }) => (
-              <input
-                type="email"
-                id="email"
-                placeholder="Email"
-                className={`${st.input} ${errors.email ? st['input-error'] : ''}`}
-                value={field.value || ''}
-                onChange={(e) => field.onChange(e.target.value)}
-              />
-            )}
-          />
-          {errors.email && (
-            <p className={st.error} data-testid="email-error">
-              {errors.email.message}
+      {stepRef.current === 'login' ? (
+        <form className={st.form} onSubmit={handleSubmit(onSubmit)}>
+          {submitError && (
+            <p className={st.error} role="alert">
+              {submitError}
             </p>
           )}
-        </div>
-
-        <div className={st['input-group']}>
-          <label htmlFor="password" className={st.label}>
-            Password
-          </label>
-          <Controller
-            control={control}
-            name="password"
-            render={({ field }) => (
-              <input
-                type="password"
-                id="password"
-                placeholder="Password"
-                className={`${st.input} ${errors.password ? st['input-error'] : ''}`}
-                value={field.value || ''}
-                onChange={(e) => field.onChange(e.target.value)}
-              />
+          <div className={st.header}>
+            {isSubmitting ? <h1>Signing in...</h1> : <h1>Sign in</h1>}
+          </div>
+
+          <div className={st['input-group']}>
+            <label htmlFor="email" className={st.label}>
+              Email
+            </label>
+            <Controller
+              control={control}
+              name="email"
+              render={({ field }) => (
+                <input
+                  type="email"
+                  id="email"
+                  placeholder="Email"
+                  className={`${st.input} ${errors.email ? st['input-error'] : ''}`}
+                  value={field.value ?? ''}
+                  onChange={(e) => field.onChange(e.target.value)}
+                />
+              )}
+            />
+            {errors.email && (
+              <p className={st.error} data-testid="email-error">
+                {errors.email.message}
+              </p>
             )}
-          />
-          {errors.password && (
-            <p className={st['input-error']}>{errors.password.message}</p>
-          )}
-        </div>
-
-        {error && <p className={st['input-error']}>{error}</p>}
-
-        <div className={st['button-container']}>
-          <button
-            type="submit"
-            className={st['button']}
-            aria-live={isSubmitting ? 'assertive' : 'polite'}
-          >
-            {isSubmitting ? 'Signing in...' : 'Sign in'}
-          </button>
-        </div>
-        <div className={st['button-container']}>
-          <LoginAuthButton />
-        </div>
-
-        <div className={st['text-container']}>
-          <p>
-            If you don't have an account, please{' '}
-            <Link href="/register">register here</Link>.
-          </p>
-        </div>
-      </form>
+          </div>
+
+          <div className={st['input-group']}>
+            <label htmlFor="password" className={st.label}>
+              Password
+            </label>
+            <Controller
+              control={control}
+              name="password"
+              render={({ field }) => (
+                <input
+                  type="password"
+                  id="password"
+                  placeholder="Password"
+                  className={`${st.input} ${errors.password ? st['input-error'] : ''}`}
+                  value={field.value ?? ''}
+                  onChange={(e) => field.onChange(e.target.value)}
+                />
+              )}
+            />
+            {errors.password && (
+              <p className={st['input-error']}>{errors.password.message}</p>
+            )}
+          </div>
+
+          {error && <p className={st['input-error']}>{error}</p>}
+
+          <div className={st['button-container']}>
+            <button
+              type="submit"
+              className={st['button']}
+              aria-live={isSubmitting ? 'assertive' : 'polite'}
+            >
+              {isSubmitting ? 'Signing in...' : 'Sign in'}
+            </button>
+          </div>
+          <div className={st['button-container']}>
+            <LoginAuthButton />
+          </div>
+
+          <div className={st['text-container']}>
+            <p>
+              If you don't have an account, please{' '}
+              <Link href="/register">register here</Link>.
+            </p>
+          </div>
+        </form>
+      ) : (
+        <EmailVerification
+          verificationCode={verificationCode.current}
+          email={emailRef.current}
+        />
+      )}
     </div>
   );
 }
diff --git a/veterans/components/common/authForm/RegisterForm.test.tsx b/veterans/components/common/authForm/RegisterForm.test.tsx
index ffbaf204..ceb30766 100644
--- a/veterans/components/common/authForm/RegisterForm.test.tsx
+++ b/veterans/components/common/authForm/RegisterForm.test.tsx
@@ -11,8 +11,9 @@ import RegisterForm from './RegisterForm';
 import { MockedProvider, MockedResponse } from '@apollo/client/testing';
 import { useRouter } from 'next/navigation';
 import { SessionProvider } from 'next-auth/react';
-import { REGISTER_MUTATION } from 'constants/graphql';
+import { LOGIN_MUTATION, REGISTER_MUTATION } from 'constants/graphql';
 import { generateSecureCode } from '@helpers/generateSecureCode';
+import LoginForm from './LoginForm';
 
 const mocks: MockedResponse[] = [
   {
@@ -94,6 +95,19 @@ const fillRegisterForm = () => {
   });
 };
 
+const fillLoginForm = (email: string, password: string) => {
+  fireEvent.change(screen.getByPlaceholderText('Email'), {
+    target: { value: email },
+  });
+  fireEvent.change(screen.getByPlaceholderText('Password'), {
+    target: { value: password },
+  });
+};
+
+const submitForm = () => {
+  fireEvent.click(screen.getByRole('button', { name: /sign in/i }));
+};
+
 describe('Auth Forms', () => {
   beforeEach(() => {
     (useRouter as jest.Mock).mockReturnValue({
@@ -187,7 +201,7 @@ describe('Auth Forms', () => {
 
     await waitFor(() => {
       expect(
-        screen.getByPlaceholderText('Email verification'),
+        screen.getByPlaceholderText('Verification code'),
       ).toBeInTheDocument();
     });
 
@@ -213,13 +227,36 @@ describe('Auth Forms', () => {
 
     await waitFor(() => {
       expect(
-        screen.getByPlaceholderText('Email verification'),
+        screen.getByPlaceholderText('Verification code'),
       ).toBeInTheDocument();
     });
 
-    const verificationInput = screen.getByPlaceholderText('Email verification');
+    const verificationInput = screen.getByPlaceholderText('Verification code');
 
     fireEvent.change(verificationInput, { target: { value: '1234' } });
     expect(verificationInput).toHaveValue('1234');
   });
+
+  it('should show an error if network is down during login', async () => {
+    const networkErrorMock = [
+      {
+        request: {
+          query: LOGIN_MUTATION,
+          variables: {
+            email: 'test@example.com',
+            password: process.env.SESSION_SECRET ?? '',
+          },
+        },
+        error: new Error('Network error'),
+      },
+    ];
+
+    customRender(<LoginForm />, networkErrorMock);
+    fillLoginForm('test@example.com', process.env.SESSION_SECRET ?? '');
+    submitForm();
+
+    await waitFor(() =>
+      expect(screen.getByText('Network error')).toBeInTheDocument(),
+    );
+  });
 });
diff --git a/veterans/components/common/authForm/RegisterForm.tsx b/veterans/components/common/authForm/RegisterForm.tsx
index 185bab3e..0b657187 100644
--- a/veterans/components/common/authForm/RegisterForm.tsx
+++ b/veterans/components/common/authForm/RegisterForm.tsx
@@ -6,10 +6,14 @@ import Link from 'next/link';
 import { useForm, Controller } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import * as yup from 'yup';
-import { useMutation } from '@apollo/client';
+import { useApolloClient, useMutation } from '@apollo/client';
 
 import { RegisterFormData } from 'types';
-import { REGISTER_MUTATION } from 'constants/graphql';
+import {
+  CURRENT_USER_QUERY,
+  LOGIN_MUTATION,
+  REGISTER_MUTATION,
+} from 'constants/graphql';
 import st from '@comComps/authForm/AuthForm.module.css';
 import { handleSendEmail } from '@helpers/handleSendEmail';
 import EmailVerification from './EmailVerification/EmailVerification';
@@ -37,6 +41,8 @@ export default function RegisterForm() {
   const [submitError, setSubmitError] = useState<string | null>(null);
   const stepRef = useRef<'register' | 'verify'>('register');
   const verificationCodeRef = useRef<string>('');
+  const emailRef = useRef<string>('');
+  const client = useApolloClient();
 
   const {
     control,
@@ -56,6 +62,25 @@ export default function RegisterForm() {
     setPasswordVisible((prev) => !prev);
   };
 
+  const [login] = useMutation(LOGIN_MUTATION, {
+    onCompleted(data) {
+      const authResult = data?.authenticateUserWithPassword;
+      if (authResult && 'item' in authResult) {
+        client.writeQuery({
+          query: CURRENT_USER_QUERY,
+          data: { authenticatedItem: authResult.item },
+        });
+      } else {
+        setSubmitError(
+          authResult?.message ?? 'Login failed after registration',
+        );
+      }
+    },
+    onError(err) {
+      setSubmitError(err.message);
+    },
+  });
+
   const [register] = useMutation(REGISTER_MUTATION, {
     onCompleted(data) {
       const createdUser = data?.createUser;
@@ -75,16 +100,23 @@ export default function RegisterForm() {
       const { data: responseData } = await register({ variables: { ...data } });
 
       if (responseData?.createUser) {
+        emailRef.current = data.email;
         const { success, code } = await handleSendEmail(data.email);
         if (success && code) {
           verificationCodeRef.current = code;
+          await login({
+            variables: {
+              email: data.email,
+              password: data.password,
+            },
+          });
         } else {
           setSubmitError('Failed to send verification email.');
         }
       }
-      // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
     } catch (error) {
       setSubmitError('An error occurred during registration');
+      throw error;
     }
   };
 
@@ -200,7 +232,10 @@ export default function RegisterForm() {
           </div>
         </form>
       ) : (
-        <EmailVerification verificationCode={verificationCodeRef.current} />
+        <EmailVerification
+          verificationCode={verificationCodeRef.current}
+          email={emailRef.current}
+        />
       )}
     </div>
   );
diff --git a/veterans/constants/graphql.ts b/veterans/constants/graphql.ts
index 91c57bbb..dd8abaa2 100644
--- a/veterans/constants/graphql.ts
+++ b/veterans/constants/graphql.ts
@@ -32,6 +32,7 @@ export const LOGIN_MUTATION = gql`
           email
           role
           name
+          isVerified
         }
       }
       ... on UserAuthenticationWithPasswordFailure {
@@ -80,7 +81,7 @@ export const CHECK_USER_QUERY = gql`
   }
 `;
 
-export const UPDATE_USER_VERIFICATION = gql`
+export const VERIFICATION_MUTATION = gql`
   mutation UpdateUserVerification($id: ID!, $isVerified: Boolean!) {
     updateUser(where: { id: $id }, data: { isVerified: $isVerified }) {
       id
diff --git a/veterans/helpers/handleSendEmail.ts b/veterans/helpers/handleSendEmail.ts
index f566b0f0..270be615 100644
--- a/veterans/helpers/handleSendEmail.ts
+++ b/veterans/helpers/handleSendEmail.ts
@@ -1,4 +1,5 @@
 import { generateSecureCode } from '@helpers/generateSecureCode';
+import { toast } from 'react-hot-toast';
 
 export const handleSendEmail = async (
   email: string,
@@ -15,8 +16,7 @@ export const handleSendEmail = async (
     });
 
     if (response.ok) {
-      // eslint-disable-next-line no-alert
-      alert('Verification email sent! Check your inbox.');
+      toast.success('Verification email sent! Check your inbox.');
       return { success: true, code: newCode };
     } else {
       throw new Error('Failed to send verification email');
diff --git a/veterans/keystone/models/User.ts b/veterans/keystone/models/User.ts
index d6eeb5f5..256f09fb 100644
--- a/veterans/keystone/models/User.ts
+++ b/veterans/keystone/models/User.ts
@@ -195,7 +195,7 @@ export const User: ListConfig<Lists.User.TypeInfo<Session>> = list({
         }: {
           session?: Session;
           item: CustomBaseItem;
-        }) => isSameUser({ session, item }),
+        }) => isAdminOrSameUser({ session, item }),
       },
       ui: {
         createView: { fieldMode: 'hidden' },
diff --git a/veterans/package-lock.json b/veterans/package-lock.json
index 2b124287..fad6cba2 100644
--- a/veterans/package-lock.json
+++ b/veterans/package-lock.json
@@ -23,12 +23,13 @@
         "https-browserify": "^1.0.0",
         "next": "^14.2.18",
         "next-auth": "^4.24.11",
+        "nodemailer": "^6.10.0",
         "os-browserify": "^0.3.0",
         "process": "^0.11.10",
         "react-error-boundary": "^5.0.0",
         "react-hook-form": "^7.54.2",
+        "react-hot-toast": "^2.5.2",
         "react-spinners": "^0.13.8",
-        "resend": "^4.2.0",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.2.0",
         "url": "^0.11.3",
@@ -47,6 +48,7 @@
         "@types/cors": "^2.8.17",
         "@types/jest": "^29.5.13",
         "@types/node": "^20.16.14",
+        "@types/nodemailer": "^6.4.17",
         "@typescript-eslint/eslint-plugin": "^8.12.2",
         "@typescript-eslint/parser": "^8.12.2",
         "dotenv-cli": "^8.0.0",
@@ -6046,39 +6048,6 @@
       "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==",
       "license": "BSD-3-Clause"
     },
-    "node_modules/@react-email/render": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@react-email/render/-/render-1.0.5.tgz",
-      "integrity": "sha512-CA69HYXPk21HhtAXATIr+9JJwpDNmAFCvdMUjWmeoD1+KhJ9NAxusMRxKNeibdZdslmq3edaeOKGbdQ9qjK8LQ==",
-      "license": "MIT",
-      "dependencies": {
-        "html-to-text": "9.0.5",
-        "prettier": "3.4.2",
-        "react-promise-suspense": "0.3.4"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "peerDependencies": {
-        "react": "^18.0 || ^19.0 || ^19.0.0-rc",
-        "react-dom": "^18.0 || ^19.0 || ^19.0.0-rc"
-      }
-    },
-    "node_modules/@react-email/render/node_modules/prettier": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
-      "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
-      "license": "MIT",
-      "bin": {
-        "prettier": "bin/prettier.cjs"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
     "node_modules/@rollup/pluginutils": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
@@ -6099,19 +6068,6 @@
       "integrity": "sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==",
       "license": "MIT"
     },
-    "node_modules/@selderee/plugin-htmlparser2": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.11.0.tgz",
-      "integrity": "sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==",
-      "license": "MIT",
-      "dependencies": {
-        "domhandler": "^5.0.3",
-        "selderee": "^0.11.0"
-      },
-      "funding": {
-        "url": "https://ko-fi.com/killymxi"
-      }
-    },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
@@ -7434,6 +7390,16 @@
         "form-data": "^4.0.0"
       }
     },
+    "node_modules/@types/nodemailer": {
+      "version": "6.4.17",
+      "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.17.tgz",
+      "integrity": "sha512-I9CCaIp6DTldEg7vyUTZi8+9Vo0hi1/T8gv3C89yk1rSAAzoKQ8H8ki/jBYJSFoH/BisgLP8tkZMlQ91CIquww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/normalize-package-data": {
       "version": "2.4.4",
       "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
@@ -10215,6 +10181,7 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -10407,32 +10374,6 @@
         "csstype": "^3.0.2"
       }
     },
-    "node_modules/dom-serializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-      "license": "MIT",
-      "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
-        "entities": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "license": "BSD-2-Clause"
-    },
     "node_modules/domexception": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
@@ -10447,35 +10388,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/domhandler": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "domelementtype": "^2.3.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/domutils": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
-      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "dom-serializer": "^2.0.0",
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
     "node_modules/dot-prop": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz",
@@ -10706,6 +10618,7 @@
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
       "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
@@ -12447,6 +12360,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/goober": {
+      "version": "2.1.16",
+      "resolved": "https://registry.npmjs.org/goober/-/goober-2.1.16.tgz",
+      "integrity": "sha512-erjk19y1U33+XAMe1VTvIONHYoSqE4iS7BYUZfHaqeohLmnC0FdxEh7rQU+6MZ4OajItzjZFSRtVANrQwNq6/g==",
+      "license": "MIT",
+      "peerDependencies": {
+        "csstype": "^3.0.10"
+      }
+    },
     "node_modules/gopd": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@@ -12706,41 +12628,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/html-to-text": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.5.tgz",
-      "integrity": "sha512-qY60FjREgVZL03vJU6IfMV4GDjGBIoOyvuFdpBDIX9yTlDw0TjxVBQp+P8NvpdIXNJvfWBTNul7fsAQJq2FNpg==",
-      "license": "MIT",
-      "dependencies": {
-        "@selderee/plugin-htmlparser2": "^0.11.0",
-        "deepmerge": "^4.3.1",
-        "dom-serializer": "^2.0.0",
-        "htmlparser2": "^8.0.2",
-        "selderee": "^0.11.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/htmlparser2": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
-      "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3",
-        "domutils": "^3.0.1",
-        "entities": "^4.4.0"
-      }
-    },
     "node_modules/http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
@@ -14293,15 +14180,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/leac": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/leac/-/leac-0.6.0.tgz",
-      "integrity": "sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://ko-fi.com/killymxi"
-      }
-    },
     "node_modules/less": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/less/-/less-4.2.2.tgz",
@@ -15456,6 +15334,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/nodemailer": {
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.10.0.tgz",
+      "integrity": "sha512-SQ3wZCExjeSatLE/HBaXS5vqUOQk6GtBdIIKxiFdmm01mOQZX/POJkO3SUX1wDiYcwUOJwT23scFSC9fY2H8IA==",
+      "license": "MIT-0",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/nopt": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
@@ -15934,19 +15821,6 @@
         "url": "https://github.com/inikulin/parse5?sponsor=1"
       }
     },
-    "node_modules/parseley": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/parseley/-/parseley-0.12.1.tgz",
-      "integrity": "sha512-e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw==",
-      "license": "MIT",
-      "dependencies": {
-        "leac": "^0.6.0",
-        "peberminta": "^0.9.0"
-      },
-      "funding": {
-        "url": "https://ko-fi.com/killymxi"
-      }
-    },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -16088,15 +15962,6 @@
         "node": ">=0.12"
       }
     },
-    "node_modules/peberminta": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/peberminta/-/peberminta-0.9.0.tgz",
-      "integrity": "sha512-XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://ko-fi.com/killymxi"
-      }
-    },
     "node_modules/peek-readable": {
       "version": "5.4.2",
       "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.4.2.tgz",
@@ -16989,6 +16854,23 @@
         "react": "^16.8.0 || ^17 || ^18 || ^19"
       }
     },
+    "node_modules/react-hot-toast": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/react-hot-toast/-/react-hot-toast-2.5.2.tgz",
+      "integrity": "sha512-Tun3BbCxzmXXM7C+NI4qiv6lT0uwGh4oAfeJyNOjYUejTsm35mK9iCaYLGv8cBz9L5YxZLx/2ii7zsIwPtPUdw==",
+      "license": "MIT",
+      "dependencies": {
+        "csstype": "^3.1.3",
+        "goober": "^2.1.16"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "react": ">=16",
+        "react-dom": ">=16"
+      }
+    },
     "node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -17010,21 +16892,6 @@
         "react-dom": "^16.8.0 || ^17 || ^18"
       }
     },
-    "node_modules/react-promise-suspense": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/react-promise-suspense/-/react-promise-suspense-0.3.4.tgz",
-      "integrity": "sha512-I42jl7L3Ze6kZaq+7zXWSunBa3b1on5yfvUW6Eo/3fFOj6dZ5Bqmcd264nJbTK/gn1HjjILAjSwnZbV4RpSaNQ==",
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^2.0.1"
-      }
-    },
-    "node_modules/react-promise-suspense/node_modules/fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==",
-      "license": "MIT"
-    },
     "node_modules/react-remove-scroll": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.3.tgz",
@@ -17464,18 +17331,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/resend": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/resend/-/resend-4.2.0.tgz",
-      "integrity": "sha512-s6ogU+BBYH1H6Zl926cpddtLRAJWeFv5cIKcuHLWk1QYhFTbpFJlhqx31pnN2f0CB075KFSrc1Xf6HG690wzuw==",
-      "license": "MIT",
-      "dependencies": {
-        "@react-email/render": "1.0.5"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/reserved-words": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz",
@@ -17717,18 +17572,6 @@
         "compute-scroll-into-view": "^3.0.2"
       }
     },
-    "node_modules/selderee": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/selderee/-/selderee-0.11.0.tgz",
-      "integrity": "sha512-5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA==",
-      "license": "MIT",
-      "dependencies": {
-        "parseley": "^0.12.0"
-      },
-      "funding": {
-        "url": "https://ko-fi.com/killymxi"
-      }
-    },
     "node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
diff --git a/veterans/package.json b/veterans/package.json
index a9f0c278..f7f4e5ba 100644
--- a/veterans/package.json
+++ b/veterans/package.json
@@ -39,12 +39,13 @@
     "https-browserify": "^1.0.0",
     "next": "^14.2.18",
     "next-auth": "^4.24.11",
+    "nodemailer": "^6.10.0",
     "os-browserify": "^0.3.0",
     "process": "^0.11.10",
     "react-error-boundary": "^5.0.0",
     "react-hook-form": "^7.54.2",
+    "react-hot-toast": "^2.5.2",
     "react-spinners": "^0.13.8",
-    "resend": "^4.2.0",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
     "url": "^0.11.3",
@@ -63,6 +64,7 @@
     "@types/cors": "^2.8.17",
     "@types/jest": "^29.5.13",
     "@types/node": "^20.16.14",
+    "@types/nodemailer": "^6.4.17",
     "@typescript-eslint/eslint-plugin": "^8.12.2",
     "@typescript-eslint/parser": "^8.12.2",
     "dotenv-cli": "^8.0.0",