diff --git a/frontend/src/hooks/api.tsx b/frontend/src/hooks/api.tsx
index f22e145a..1a07ad1f 100644
--- a/frontend/src/hooks/api.tsx
+++ b/frontend/src/hooks/api.tsx
@@ -76,7 +76,7 @@ export class api {
   }
   public async getUserById(userId: string | undefined): Promise<string> {
     const response = await this.api.get(`/users/${userId}`);
-    return response.data.email;
+    return response.data.username;
   }
   public async getRobots(): Promise<Robot[]> {
     try {
diff --git a/frontend/src/pages/Login.tsx b/frontend/src/pages/Login.tsx
index 0f386848..63d33de6 100644
--- a/frontend/src/pages/Login.tsx
+++ b/frontend/src/pages/Login.tsx
@@ -31,6 +31,7 @@ const Login = () => {
         <label htmlFor="email">Email:</label>
         <Form.Control
           id="email"
+          autoComplete="username"
           className="mb-3"
           type="text"
           placeholder="Email"
@@ -43,6 +44,7 @@ const Login = () => {
         Description:
         <Form.Control
           id="password"
+          autoComplete="password"
           className="mb-3"
           type="password"
           placeholder="Password"
diff --git a/frontend/src/pages/Register.tsx b/frontend/src/pages/Register.tsx
index e0ee3f2d..88206682 100644
--- a/frontend/src/pages/Register.tsx
+++ b/frontend/src/pages/Register.tsx
@@ -38,6 +38,7 @@ const Register = () => {
         <label htmlFor="email">Email:</label>
         <Form.Control
           id="email"
+          autoComplete="email"
           className="mb-3"
           type="text"
           placeholder="Email"
@@ -50,6 +51,7 @@ const Register = () => {
         <label htmlFor="username">Username:</label>
         <Form.Control
           id="username"
+          autoComplete="username"
           className="mb-3"
           type="text"
           placeholder="Username"
@@ -62,6 +64,7 @@ const Register = () => {
         Description:
         <Form.Control
           id="password"
+          autoComplete="new-password"
           className="mb-3"
           type="password"
           placeholder="Password"
diff --git a/store/app/routers/users.py b/store/app/routers/users.py
index e33ec236..61d0c952 100644
--- a/store/app/routers/users.py
+++ b/store/app/routers/users.py
@@ -143,6 +143,7 @@ async def login_user_endpoint(
 
 class UserInfoResponse(BaseModel):
     email: str
+    username: str
 
 
 @users_router.get("/me", response_model=UserInfoResponse)
@@ -156,7 +157,7 @@ async def get_user_info_endpoint(
     user_obj = await crud.get_user(user_id)
     if user_obj is None:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="User not found")
-    return UserInfoResponse(email=user_obj.email)
+    return UserInfoResponse(email=user_obj.email, username=user_obj.username)
 
 
 @users_router.delete("/me")
@@ -191,4 +192,4 @@ async def get_user_info_by_id_endpoint(user_id: str, crud: Annotated[Crud, Depen
     user_obj = await crud.get_user(user_id)
     if user_obj is None:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="User not found")
-    return UserInfoResponse(email=user_obj.email)
+    return UserInfoResponse(email=user_obj.email, username=user_obj.username)