diff --git a/modules/auth/auth.controller.js b/modules/auth/auth.controller.js
index c24ccf8..7b18ecf 100644
--- a/modules/auth/auth.controller.js
+++ b/modules/auth/auth.controller.js
@@ -91,7 +91,12 @@ async function register(req, res, next) {
         phone: req.body.phone,
         fbuid: req.body.fbuid
     };
-    const tokens = securityHelper.generateToken(values);
+
+    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);
@@ -109,19 +114,19 @@ async function register(req, res, next) {
             };
 
             newUser = await authService.extraMethods.createUser(data);
+            newUser = newUser.toJSON();
 
         } catch (error) {
             console.error(error);
-            controllerHelper.handleErrorResponse(MODULE_NAME, register.name, error, res);
+            return controllerHelper.handleErrorResponse(MODULE_NAME, register.name, error, res);
         }
     };
 
-    if (newUser)
-       newUser = cleanAdminData(newUser);
-       
-    newUser.token = tokens.token;
-    //console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>');    
-    //console.log(newUser);
+    if (newUser) {
+        newUser = cleanAdminData(newUser);
+        newUser.token = tokens.token;
+    }
+    
     return controllerHelper.handleResultResponse(newUser, null, req.params, res, httpStatus.OK);    
 }
 
@@ -158,7 +163,7 @@ async function rejectToken(req, res, next) {
             await authService.extraMethods.deleteRefreshToken(refreshToken);
             return controllerHelper.handleResultResponse(result, null, req.params, res, httpStatus.OK);
         } catch (error) {
-            controllerHelper.handleErrorResponse(MODULE_NAME, rejectToken.name, error, res);
+            return controllerHelper.handleErrorResponse(MODULE_NAME, rejectToken.name, error, res);
         }    
     } else {
         return controllerHelper.handleResultResponse(null, null, req.params, res, httpStatus.NOT_FOUND);