diff --git a/src/components/PageLayout/Authentication/Authentication.module.scss b/src/components/PageLayout/Authentication/Authentication.module.scss
index 3a108549..60c78e1c 100644
--- a/src/components/PageLayout/Authentication/Authentication.module.scss
+++ b/src/components/PageLayout/Authentication/Authentication.module.scss
@@ -14,17 +14,3 @@
     border-left: 2px solid white;
   }
 }
-
-.authenticationContainer {
-  place-self: center;
-  padding: 0px;
-  width: 300px;
-  color: black;
-  background-color: white;
-  z-index: 1000;
-  border: 10px solid black;
-
-  .content {
-    padding: 20px;
-  }
-}
diff --git a/src/components/PageLayout/Authentication/Authentication.module.scss.d.ts b/src/components/PageLayout/Authentication/Authentication.module.scss.d.ts
index ef50130a..3081527a 100644
--- a/src/components/PageLayout/Authentication/Authentication.module.scss.d.ts
+++ b/src/components/PageLayout/Authentication/Authentication.module.scss.d.ts
@@ -1,7 +1,5 @@
 export type Styles = {
-  authenticationContainer: string
   authenticationDisplayButtons: string
-  content: string
 }
 
 export type ClassNames = keyof Styles
diff --git a/src/components/PageLayout/Authentication/Authentication.tsx b/src/components/PageLayout/Authentication/Authentication.tsx
index c03849ed..2d5cd186 100644
--- a/src/components/PageLayout/Authentication/Authentication.tsx
+++ b/src/components/PageLayout/Authentication/Authentication.tsx
@@ -5,16 +5,16 @@ import {FC, useState} from 'react'
 import {AuthContainer} from '@/utils/AuthContainer'
 import {useSeminarInfo} from '@/utils/useSeminarInfo'
 
-import {Overlay} from '../../Overlay/Overlay'
+import {Dialog} from '../../Dialog/Dialog'
 import {LoginFormWrapper} from '../LoginFormWrapper/LoginFormWrapper'
 import styles from './Authentication.module.scss'
 
 export const Authentication: FC = () => {
-  const [displayAuthenticationOverlay, setDisplayAuthenticationOverlay] = useState(false)
+  const [displayAuthenticationDialog, setDisplayAuthenticationDialog] = useState(false)
   const {logout, isAuthed} = AuthContainer.useContainer()
 
-  const toggleDisplayLoginOverlay = () => {
-    setDisplayAuthenticationOverlay((prev) => !prev)
+  const toggleDisplayAuthenticationDialog = () => {
+    setDisplayAuthenticationDialog((prev) => !prev)
   }
 
   const {seminar} = useSeminarInfo()
@@ -33,15 +33,13 @@ export const Authentication: FC = () => {
       <>
         <div className={styles.authenticationDisplayButtons}>
           <Link href={`/${seminar}/registracia`}>Registrovať</Link>
-          <span onClick={toggleDisplayLoginOverlay}>Prihlásiť</span>
+          <span onClick={toggleDisplayAuthenticationDialog}>Prihlásiť</span>
         </div>
-        <Overlay display={displayAuthenticationOverlay} closeOverlay={toggleDisplayLoginOverlay}>
-          <div className={styles.authenticationContainer}>
-            <div className={styles.content}>
-              <LoginFormWrapper closeOverlay={toggleDisplayLoginOverlay} />
-            </div>
-          </div>
-        </Overlay>
+        <Dialog
+          open={displayAuthenticationDialog}
+          close={toggleDisplayAuthenticationDialog}
+          contentText={<LoginFormWrapper closeDialog={toggleDisplayAuthenticationDialog} />}
+        />
       </>
     )
   } else {
diff --git a/src/components/PageLayout/LoginForm/LoginForm.tsx b/src/components/PageLayout/LoginForm/LoginForm.tsx
index aa6d493f..0d780292 100644
--- a/src/components/PageLayout/LoginForm/LoginForm.tsx
+++ b/src/components/PageLayout/LoginForm/LoginForm.tsx
@@ -19,14 +19,14 @@ const defaultValues: LoginFormValues = {
   password: '',
 }
 
-export const LoginForm: FC<LoginFormWrapperProps> = ({closeOverlay}) => {
+export const LoginForm: FC<LoginFormWrapperProps> = ({closeDialog: closeDialog}) => {
   const {login} = AuthContainer.useContainer()
   const {handleSubmit, control} = useForm<LoginFormValues>({defaultValues})
 
   const router = useRouter()
 
   const redirectClose = () => {
-    closeOverlay()
+    closeDialog()
     if (router.asPath.endsWith('registracia')) {
       router.push('/')
     }
diff --git a/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx b/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx
index d2e4cb56..f6e543b5 100644
--- a/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx
+++ b/src/components/PageLayout/LoginFormWrapper/LoginFormWrapper.tsx
@@ -9,10 +9,10 @@ import {LoginForm} from '../LoginForm/LoginForm'
 import {PasswordResetRequestForm} from '../PasswordResetRequest/PasswordResetRequest'
 
 export type LoginFormWrapperProps = {
-  closeOverlay: () => void
+  closeDialog: () => void
 }
 
-export const LoginFormWrapper: FC<LoginFormWrapperProps> = ({closeOverlay}) => {
+export const LoginFormWrapper: FC<LoginFormWrapperProps> = ({closeDialog: closeDialog}) => {
   const router = useRouter()
   const [form, changeForm] = useState('login')
 
@@ -21,7 +21,7 @@ export const LoginFormWrapper: FC<LoginFormWrapperProps> = ({closeOverlay}) => {
   if (form === 'login')
     return (
       <Stack gap={2}>
-        <LoginForm closeOverlay={closeOverlay} />
+        <LoginForm closeDialog={closeDialog} />
         <Stack alignItems="center" mt={2}>
           <Button
             onClick={() => {
@@ -36,7 +36,7 @@ export const LoginFormWrapper: FC<LoginFormWrapperProps> = ({closeOverlay}) => {
 
   return (
     <PasswordResetRequestForm
-      closeOverlay={() => {
+      closeDialog={() => {
         router.push(`/${seminar}/reset-sent`)
       }}
     />
diff --git a/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx b/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx
index 3ed8f952..6b2ac661 100644
--- a/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx
+++ b/src/components/PageLayout/PasswordResetRequest/PasswordResetRequest.tsx
@@ -18,7 +18,7 @@ const defaultValues: PasswordResetRequestFormValues = {
   email: '',
 }
 
-export const PasswordResetRequestForm: FC<LoginFormWrapperProps> = ({closeOverlay}) => {
+export const PasswordResetRequestForm: FC<LoginFormWrapperProps> = ({closeDialog: closeDialog}) => {
   const {handleSubmit, control} = useForm<PasswordResetRequestFormValues>({defaultValues})
 
   const requiredRule = {required: '* Toto pole nemôže byť prázdne.'}
@@ -29,7 +29,7 @@ export const PasswordResetRequestForm: FC<LoginFormWrapperProps> = ({closeOverla
     },
 
     onSuccess: () => {
-      closeOverlay()
+      closeDialog()
     },
   })
 
diff --git a/src/components/PasswordReset/PasswordReset.tsx b/src/components/PasswordReset/PasswordReset.tsx
index ffba07a7..2c50e47e 100644
--- a/src/components/PasswordReset/PasswordReset.tsx
+++ b/src/components/PasswordReset/PasswordReset.tsx
@@ -57,7 +57,7 @@ export const PasswordResetForm: FC<PasswordResetFormProps> = ({uid, token}) => {
       <Stack gap={2}>
         <Typography variant="body1">Heslo úspešne zmenené, môžeš sa prihlásiť</Typography>
         <LoginForm
-          closeOverlay={() => {
+          closeDialog={() => {
             router.push('/')
           }}
         />
diff --git a/src/components/Problems/Problems.tsx b/src/components/Problems/Problems.tsx
index e7cbb98f..256070f1 100644
--- a/src/components/Problems/Problems.tsx
+++ b/src/components/Problems/Problems.tsx
@@ -164,7 +164,7 @@ export const Problems: FC = () => {
         contentText={
           <Stack alignItems={'center'} gap={3}>
             <Typography variant="body1">Pre odovzdanie sa prihlás.</Typography>
-            <LoginFormWrapper closeOverlay={closeLoginDialog} />
+            <LoginFormWrapper closeDialog={closeLoginDialog} />
           </Stack>
         }
       />
diff --git a/src/components/VerifyEmail/VerifyEmail.tsx b/src/components/VerifyEmail/VerifyEmail.tsx
index 5522f452..66cd417d 100644
--- a/src/components/VerifyEmail/VerifyEmail.tsx
+++ b/src/components/VerifyEmail/VerifyEmail.tsx
@@ -35,7 +35,7 @@ export const VerifyEmail: FC = () => {
       <>
         <Typography variant="body1">Pre dokončenie overenia emailu sa prihlás</Typography>
         <LoginForm
-          closeOverlay={() => {
+          closeDialog={() => {
             router.push('/')
           }}
         />