diff --git a/website/app/controllers/authentication_controller.ts b/website/app/controllers/authentication_controller.ts
index 894166e..bd1e213 100644
--- a/website/app/controllers/authentication_controller.ts
+++ b/website/app/controllers/authentication_controller.ts
@@ -2,6 +2,7 @@ import Account from '#models/account'
 import { socialAccountLoginValidator } from '#validators/account'
 import User from '#models/user'
 import type { HttpContext } from '@adonisjs/core/http'
+import { createUserValidator, createUserValidatorErrorMessage } from '#validators/authentication'
 
 async function getOrCreate(search: Pick<Account, 'provider' | 'providerId'>) {
   const account = await Account.firstOrCreate({
@@ -25,25 +26,23 @@ export default class AuthenticationController {
       response.redirect('/')
     } catch (error) {
       session.flash('errorsBag', { oauth: 'Email ou palavra-passe incorretos' })
-      response.redirect().back()
+      return response.redirect().back()
     }
   }
 
   async register({ request, auth, response, session }: HttpContext) {
-    const { email, password, confirmPassword } = request.only([
-      'email',
-      'password',
-      'confirmPassword',
-    ])
+    try {
+      await request.validateUsing(createUserValidator)
+    } catch (error) {
+      session.flash('errorsBag', { oauth: createUserValidatorErrorMessage(error) })
+      return response.redirect().toRoute('view.register')
+    }
+
+    const { email, password } = request.only(['email', 'password'])
 
     if (await User.query().where('email', email).first()) {
       session.flash('errorsBag', { oauth: 'Este e-mail já está em uso' })
-      response.redirect().back()
-    }
-
-    if (confirmPassword !== password) {
-      session.flash('errorsBag', { oauth: 'Palavras-passes não coincidem' })
-      response.redirect().back()
+      return response.redirect().toRoute('view.register')
     }
 
     try {
@@ -60,7 +59,8 @@ export default class AuthenticationController {
 
       response.redirect('/')
     } catch (error) {
-      console.log(error)
+      session.flash('errorsBag', { oauth: 'Ocorreu um erro no registo' })
+      return response.redirect().toRoute('view.register')
     }
   }
 
diff --git a/website/app/validators/authentication.ts b/website/app/validators/authentication.ts
new file mode 100644
index 0000000..99a8ee8
--- /dev/null
+++ b/website/app/validators/authentication.ts
@@ -0,0 +1,22 @@
+import vine from '@vinejs/vine'
+import { VineValidationError } from '../../types/validation.js'
+
+export const createUserValidator = vine.compile(
+  vine.object({
+    email: vine.string().email(),
+    password: vine.string().minLength(8).confirmed(),
+  })
+)
+
+export const createUserValidatorErrorMessage = (error: VineValidationError) => {
+  const rule = error.messages[0].rule
+
+  switch (rule) {
+    case 'email':
+      return 'E-mail inválido'
+    case 'minLength':
+      return 'Palavra-passe tem de ter no mínimo 8 caratéres'
+    case 'confirmed':
+      return 'Palavras-passe não coincidem'
+  }
+}
diff --git a/website/inertia/pages/login.tsx b/website/inertia/pages/login.tsx
index a203c7e..cfa4093 100644
--- a/website/inertia/pages/login.tsx
+++ b/website/inertia/pages/login.tsx
@@ -1,9 +1,8 @@
 import { Link } from '@tuyau/inertia/react'
-import { Button, buttonVariants } from '~/components/ui/button'
+import { Button } from '~/components/ui/button'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '~/components/ui/card'
 import { Input } from '~/components/ui/input'
 import { Label } from '~/components/ui/label'
-import { Separator } from '~/components/ui/separator'
 import { useError } from '~/hooks/use_error'
 import { useForm } from '@inertiajs/react'
 import { cn } from '~/lib/utils'
@@ -27,7 +26,7 @@ export default function Login() {
     <AppLayout title="Iniciar Sessão">
       <div className="flex items-center justify-center w-full mt-16">
         <div className="flex flex-col gap-6 max-w-sm">
-          <Card className={cn(oauthError && 'border-red-600')}>
+          <Card className={cn(oauthError && 'border-2 border-red-600')}>
             <CardHeader>
               <CardTitle className="text-2xl text-enei-blue">Iniciar Sessão</CardTitle>
               <CardDescription>
@@ -71,34 +70,34 @@ export default function Login() {
                     <Button type="submit" className="w-full bg-enei-blue">
                       Iniciar Sessão
                     </Button>
-                    <div className="flex gap-2 items-center">
-                      <Separator className="shrink" />
-                      <p className="text-sm text-muted-foreground min-w-max">Ou</p>
-                      <Separator className="shrink" />
-                    </div>
-                    <div className="grid grid-cols-3 gap-2">
-                      <Link
-                        route="auth.google.initiate"
-                        className={cn(buttonVariants({ variant: 'outline' }), 'w-full')}
-                      >
-                        <span className="sr-only">Iniciar Sessão com o</span> Google
-                        {/* <Google className="h-5 w-5" /> */}
-                      </Link>
-                      <Link
-                        route="auth.github.initiate"
-                        className={cn(buttonVariants({ variant: 'outline' }), 'w-full')}
-                      >
-                        <span className="sr-only">Iniciar Sessão com o</span> Github
-                        {/* <Github className="h-5 w-5" /> */}
-                      </Link>
-                      <Link
-                        route="auth.linkedin.initiate"
-                        className={cn(buttonVariants({ variant: 'outline' }), 'w-full')}
-                      >
-                        <span className="sr-only">Iniciar Sessão com o</span> LinkedIn
-                        {/* <LinkedIn className="h-5 w-5" /> */}
-                      </Link>
-                    </div>
+                    {/* <div className="flex gap-2 items-center"> */}
+                    {/*   <Separator className="shrink" /> */}
+                    {/*   <p className="text-sm text-muted-foreground min-w-max">Ou</p> */}
+                    {/*   <Separator className="shrink" /> */}
+                    {/* </div> */}
+                    {/* <div className="grid grid-cols-3 gap-2"> */}
+                    {/* <Link */}
+                    {/*   route="auth.google.initiate" */}
+                    {/*   className={cn(buttonVariants({ variant: 'outline' }), 'w-full')} */}
+                    {/* > */}
+                    {/*   <span className="sr-only">Iniciar Sessão com o</span> Google */}
+                    {/*   {/* <Google className="h-5 w-5" /> */}
+                    {/* </Link> */}
+                    {/* <Link */}
+                    {/*   route="auth.github.initiate" */}
+                    {/*   className={cn(buttonVariants({ variant: 'outline' }), 'w-full')} */}
+                    {/* > */}
+                    {/*   <span className="sr-only">Iniciar Sessão com o</span> Github */}
+                    {/*   {/* <Github className="h-5 w-5" /> */}
+                    {/* </Link> */}
+                    {/* <Link */}
+                    {/*   route="auth.linkedin.initiate" */}
+                    {/*   className={cn(buttonVariants({ variant: 'outline' }), 'w-full')} */}
+                    {/* > */}
+                    {/*   <span className="sr-only">Iniciar Sessão com o</span> LinkedIn */}
+                    {/*   {/* <LinkedIn className="h-5 w-5" /> */}
+                    {/* </Link> */}
+                    {/* </div> */}
                   </div>
                 </div>
                 <div className="mt-4 text-center text-sm">
@@ -108,9 +107,9 @@ export default function Login() {
                   </Link>
                 </div>
               </form>
+              {oauthError && <p className="text-sm text-red-600 text-center mt-4">{oauthError}</p>}
             </CardContent>
           </Card>
-          {oauthError && <p className="text-sm text-red-600 text-center">{oauthError}</p>}
         </div>
       </div>
     </AppLayout>
diff --git a/website/inertia/pages/register.tsx b/website/inertia/pages/register.tsx
index 4127b7d..3fcbd36 100644
--- a/website/inertia/pages/register.tsx
+++ b/website/inertia/pages/register.tsx
@@ -1,9 +1,7 @@
-import { Link } from '@tuyau/inertia/react'
-import { Button, buttonVariants } from '~/components/ui/button'
+import { Button } from '~/components/ui/button'
 import { Card, CardContent, CardHeader, CardTitle, CardDescription } from '~/components/ui/card'
 import { Input } from '~/components/ui/input'
 import { Label } from '~/components/ui/label'
-import { Separator } from '~/components/ui/separator'
 import { useError } from '~/hooks/use_error'
 import { useForm } from '@inertiajs/react'
 import { cn } from '~/lib/utils'
@@ -28,7 +26,7 @@ export default function Login() {
     <AppLayout title="Criar conta">
       <div className="flex items-center justify-center w-full mt-24">
         <div className="flex flex-col gap-6 max-w-sm">
-          <Card className={cn(oauthError && 'border-red-600')}>
+          <Card className={cn(oauthError && 'border-2 border-red-600')}>
             <CardHeader>
               <CardTitle className="text-2xl text-enei-blue">Criar conta</CardTitle>
               <CardDescription>
@@ -42,7 +40,7 @@ export default function Login() {
                     <Label htmlFor="email">E-mail</Label>
                     <Input
                       id="email"
-                      type="email"
+                      type="text"
                       placeholder="alice@eneiconf.pt"
                       value={data.email}
                       onChange={(e) => setData('email', e.target.value)}
@@ -80,40 +78,40 @@ export default function Login() {
                     <Button type="submit" className="w-full bg-enei-blue">
                       Criar conta
                     </Button>
-                    <div className="flex gap-2 items-center">
-                      <Separator className="shrink" />
-                      <p className="text-sm text-muted-foreground min-w-max">Ou</p>
-                      <Separator className="shrink" />
-                    </div>
-                    <div className="grid grid-cols-3 gap-2">
-                      <Link
-                        route="auth.google.initiate"
-                        className={cn(buttonVariants({ variant: 'outline' }), 'w-full')}
-                      >
-                        <span className="sr-only">Iniciar Sessão com o</span> Google
-                        {/* <Google className="h-5 w-5" /> */}
-                      </Link>
-                      <Link
-                        route="auth.github.initiate"
-                        className={cn(buttonVariants({ variant: 'outline' }), 'w-full')}
-                      >
-                        <span className="sr-only">Iniciar Sessão com o</span> Github
-                        {/* <Github className="h-5 w-5" /> */}
-                      </Link>
-                      <Link
-                        route="auth.linkedin.initiate"
-                        className={cn(buttonVariants({ variant: 'outline' }), 'w-full')}
-                      >
-                        <span className="sr-only">Iniciar Sessão com o</span> LinkedIn
-                        {/* <LinkedIn className="h-5 w-5" /> */}
-                      </Link>
-                    </div>
+                    {/* <div className="flex gap-2 items-center"> */}
+                    {/*   <Separator className="shrink" /> */}
+                    {/*   <p className="text-sm text-muted-foreground min-w-max">Ou</p> */}
+                    {/*   <Separator className="shrink" /> */}
+                    {/* </div> */}
+                    {/* <div className="grid grid-cols-3 gap-2"> */}
+                    {/*   <Link */}
+                    {/*     route="auth.google.initiate" */}
+                    {/*     className={cn(buttonVariants({ variant: 'outline' }), 'w-full')} */}
+                    {/*   > */}
+                    {/*     <span className="sr-only">Iniciar Sessão com o</span> Google */}
+                    {/*     {/* <Google className="h-5 w-5" /> */}
+                    {/*   </Link> */}
+                    {/*   <Link */}
+                    {/*     route="auth.github.initiate" */}
+                    {/*     className={cn(buttonVariants({ variant: 'outline' }), 'w-full')} */}
+                    {/*   > */}
+                    {/*     <span className="sr-only">Iniciar Sessão com o</span> Github */}
+                    {/*     {/* <Github className="h-5 w-5" /> */}
+                    {/*   </Link> */}
+                    {/*   <Link */}
+                    {/*     route="auth.linkedin.initiate" */}
+                    {/*     className={cn(buttonVariants({ variant: 'outline' }), 'w-full')} */}
+                    {/*   > */}
+                    {/*     <span className="sr-only">Iniciar Sessão com o</span> LinkedIn */}
+                    {/*     {/* <LinkedIn className="h-5 w-5" /> */}
+                    {/*   </Link> */}
+                    {/* </div> */}
                   </div>
                 </div>
               </form>
+              {oauthError && <p className="text-sm text-red-600 text-center mt-4">{oauthError}</p>}
             </CardContent>
           </Card>
-          {oauthError && <p className="text-sm text-red-600 text-center">{oauthError}</p>}
         </div>
       </div>
     </AppLayout>
diff --git a/website/types/validation.ts b/website/types/validation.ts
new file mode 100644
index 0000000..d5afab6
--- /dev/null
+++ b/website/types/validation.ts
@@ -0,0 +1,14 @@
+/**
+ * Types declared for error formats in the validators using vine
+ */
+
+export type VineValidationError = {
+  code: string
+  messages: Array<VineValidationErrorMessage>
+}
+
+export type VineValidationErrorMessage = {
+  rule: string
+  message: string
+  field: string
+}