diff --git a/src/pages/api/login.js b/src/pages/api/login.js
index c3f5cdd..8aafb2e 100644
--- a/src/pages/api/login.js
+++ b/src/pages/api/login.js
@@ -34,29 +34,33 @@ db.get(sql, [username], async (err, userRecord) => {
         const tokenPayload = { 
                                 email:userRecord.email,
                                 role: userRecord.type,
+                                iat: Math.floor(Date.now() / 1000),
                                 exp: Math.floor(Date.now() / 1000) + 3600*24*7,
                                 
                             };
         const jwtToken = jwt.sign(tokenPayload, secretKey, { algorithm: 'HS256' });
         const jwtTokenData ={ 
             data:{
-                access_token:
-                username: username,
-                exp: Math.floor(Date.now() / 1000) + 3600*24*7,
+                access_token:jwtToken,
+                role: userRecord.type,
+                email: userRecord.email,
+                expires: 3600*24*7,
             
             }
         };
 
         // Return the JWT token
-        res.status(200).json(jwtToken);
+        res.status(200).json(jwtTokenData);
         console.log(jwtToken);
       } else {
         console.log('Invalid password');
+        res.status(400).json({err:'400P'});
       }
     } catch (err) {
       console.error(err);
     }
   } else {
+    res.status(400).json({err:'400U'});
     console.log('User not found');
   }