diff --git a/webapp/src/components/login/Login.tsx b/webapp/src/components/login/Login.tsx
index feed050..595902a 100644
--- a/webapp/src/components/login/Login.tsx
+++ b/webapp/src/components/login/Login.tsx
@@ -1,5 +1,5 @@
 // src/components/Login.js
-import  {  useState } from 'react';
+import { useState, KeyboardEvent } from 'react';
 import axios from 'axios';
 import { Container, Typography, TextField, Snackbar, Button, Stack } from '@mui/material';
 import { useTranslation } from 'react-i18next';
@@ -25,13 +25,13 @@ const Login = (props: ActionProps) => {
     props.goBack();
   };
 
-  const loginUser = async () => {
+  async function loginUser () {
 
     try {
       localStorage.clear();
       const user = await axios.post(`${apiEndpoint}/login`, { username, password });
   
-      console.log(user.data);
+      console.log(user);
       localStorage.setItem("username", user.data.username);
       localStorage.setItem("score", user.data.totalScore);
       localStorage.setItem("nWins", user.data.nWins);
@@ -51,6 +51,11 @@ const Login = (props: ActionProps) => {
     setOpenSnackbar(false);
   };
 
+  const handleKeyPress = (event: KeyboardEvent<HTMLDivElement>) => {
+    if(event.key === 'Enter'){
+      loginUser();
+    }
+  };
 
   return (
     <Container component="main" maxWidth="xs" sx={{ marginTop: 3 }}>
@@ -72,6 +77,7 @@ const Login = (props: ActionProps) => {
             type="password"
             value={password}
             onChange={(e) => setPassword(e.target.value)}
+            onKeyDown={handleKeyPress}
           />
           <Stack direction="column" spacing={2}>
             <Button  color="primary" onClick={loginUser}>
diff --git a/webapp/src/components/register/Register.tsx b/webapp/src/components/register/Register.tsx
index 452ab32..7808d54 100644
--- a/webapp/src/components/register/Register.tsx
+++ b/webapp/src/components/register/Register.tsx
@@ -1,8 +1,9 @@
-import  { useState } from 'react';
+import  { useState, KeyboardEvent } from 'react';
 import axios from 'axios';
 import { Container, Typography, TextField, Snackbar, Stack, Button } from '@mui/material';
 import { useTranslation } from 'react-i18next';
 import './Register.scss';
+import { useNavigate } from "react-router-dom";
 
 const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 
@@ -11,17 +12,33 @@ type ActionProps = {
 }
 
 const Register = (props:ActionProps) => {
+  const navigate = useNavigate();
   const { t } = useTranslation();
   const [username, setUsername] = useState('');
   const [password, setPassword] = useState('');
   const [error, setError] = useState('');
   const [openSnackbar, setOpenSnackbar] = useState(false);
 
-  const addUser = async () => {
+  async function addUser () {
     try {
       // checkear que el username no exista (tiene que ser unico)
       await axios.post(`${apiEndpoint}/adduser`, { username, password });
       setOpenSnackbar(true);
+
+      localStorage.clear();
+      const user = await axios.post(`${apiEndpoint}/login`, { username, password });
+  
+      console.log(user.data);
+      localStorage.setItem("username", user.data.username);
+      localStorage.setItem("score", user.data.totalScore);
+      localStorage.setItem("nWins", user.data.nWins);
+      localStorage.setItem("uuid", user.data.uuid);
+      localStorage.setItem("isAuthenticated", JSON.stringify(true));
+      // Extract data from the response
+      localStorage.setItem('userUUID', user.data.uuid);
+
+      setOpenSnackbar(true);
+      navigate("/game")
     } catch (error) {
       setError(error.response.data.error);
     }
@@ -36,6 +53,12 @@ const Register = (props:ActionProps) => {
     props.goBack();
   };
 
+  const handleKeyPress = (event: KeyboardEvent<HTMLDivElement>) => {
+    if(event.key === 'Enter'){
+        addUser();
+    }
+  };
+
   return (
     <Container component="main" maxWidth="xs" sx={{ marginTop: 3 }}>
       <Typography component="h1" variant="h5">
@@ -57,6 +80,7 @@ const Register = (props:ActionProps) => {
         type="password"
         value={password}
         onChange={(e) => setPassword(e.target.value)}
+        onKeyDown={handleKeyPress}
       />
       <Stack direction="column">
         <Button color="primary" onClick={addUser}>