diff --git a/modules/auth/auth.controller.js b/modules/auth/auth.controller.js
index f5ea4bf..58446ca 100644
--- a/modules/auth/auth.controller.js
+++ b/modules/auth/auth.controller.js
@@ -97,12 +97,6 @@ async function register(req, res, next) {
         fbuid: req.body.fbuid
     };
 
-    const tokenData = {
-        phone: values.phone,
-        fbuid: values.fbuid,
-    };
-    const tokens = securityHelper.generateToken(tokenData);
-
     //Comprobamos si el usuario ya existe en nuestro sistema
     let newUser = await authService.extraMethods.findUser(values);
     if (!newUser) {
@@ -129,6 +123,15 @@ async function register(req, res, next) {
     if (newUser) {
         newUser = newUser.toJSON();
         newUser = cleanAdminData(newUser);
+
+        const tokenData = {
+            phone: values.phone,
+            fbuid: values.fbuid,
+            id: newUser.id,
+            email: newUser.email,
+        };
+        const tokens = securityHelper.generateToken(tokenData);
+
         newUser.token = tokens.token;
     }
     
@@ -143,7 +146,9 @@ async function regenerateToken(req, res, next) {
     if (user && user.phone === phone) {
         const values = {
             phone: user.phone,
-            platform: user.fbuid
+            fbuid: user.fbuid,
+            id: user.id,
+            email: user.email,
         };
         
         try {