diff --git a/config/environments/development.js b/config/environments/development.js
index 92ab079..697eda5 100644
--- a/config/environments/development.js
+++ b/config/environments/development.js
@@ -9,7 +9,7 @@ module.exports = {
 
     session: {
         secret_token: process.env.SECRET_TOKEN || "B57J=7B`NQ$y98|~5;hc715bo09^5oz8NR+]n9r~215B91Nd9P%25_N6r!GHcOKp|18y5-73Dr5^@9k7n]5l<-41D1o",
-        token_expires_in: '5'
+        token_expires_in: '300'
     },
 
     server: {
diff --git a/config/environments/production.js b/config/environments/production.js
index 4fa5e24..7be80cb 100644
--- a/config/environments/production.js
+++ b/config/environments/production.js
@@ -9,7 +9,7 @@ module.exports = {
 
     session: {
         secret_token: process.env.SECRET_TOKEN || "B57J=7B`NQ$y98|~5;hc715bo09^5oz8NR+]n9r~215B91Nd9P%25_N6r!GHcOKp|18y5-73Dr5^@9k7n]5l<-41D1o",
-        token_expires_in: '5'
+        token_expires_in: '300'
     },
 
     server: {
diff --git a/modules/auth/auth.controller.js b/modules/auth/auth.controller.js
index dd404f5..f04efe4 100644
--- a/modules/auth/auth.controller.js
+++ b/modules/auth/auth.controller.js
@@ -39,6 +39,16 @@ async function login(req, res, next) {
 }
 
 async function register(req, res, next) {
+    function cleanAdminData(user) {
+        let cUser = user;
+        delete cUser.token;
+        delete cUser.lastLogin;
+        delete cUser.state;
+        delete cUser.createdAt;
+        delete cUser.updatedAt;
+        return cUser;
+    }
+
     try {
         console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>regsitro');        
  
@@ -63,8 +73,9 @@ async function register(req, res, next) {
 
         const newUser = await authService.extraMethods.createUser(data);
         const result = {
-            token: 'JWT ' + tokens.token,
-            user: newUser,
+            token: tokens.token,
+            refreshToken: tokens.token,
+            user: cleanAdminData(newUser.toJSON()),
         };
         console.log(result);
         return controllerHelper.handleResultResponse(result, null, req.params, res, httpStatus.OK);
@@ -88,7 +99,7 @@ async function regenerateToken(req, res, next) {
         try {
             const tokens = securityHelper.generateToken(values);
             await authService.extraMethods.updateUserRefreshToken(user.id, tokens.refreshToken);
-            const result = { token: 'JWT ' + tokens.token };
+            const result = { token: tokens.token };
             return controllerHelper.handleResultResponse(result, null, req.params, res, httpStatus.OK);
         } catch(error) {
             controllerHelper.handleErrorResponse(MODULE_NAME, regenerateToken.name, error, res);
diff --git a/modules/auth/auth.routes.js b/modules/auth/auth.routes.js
index bc67e14..16d2e72 100644
--- a/modules/auth/auth.routes.js
+++ b/modules/auth/auth.routes.js
@@ -20,8 +20,6 @@ routes.post('/auth',
 routes.post('/register',
     SchemaValidator(authValidation.RegisterInputType, true),
     AccessValidator.isRegisteredUserPhone,
-    
-    
     authController.register,
 );
 
@@ -31,6 +29,12 @@ routes.get('/pepepe', AccessValidator.isLoggedUser,
     }
 );
 
+routes.get('/test_jwt', AccessValidator.isLoggedUser,
+    function (req, res) {
+        res.json({ success: 'You are authenticated with JWT!', user: req.user })
+    }
+);
+
 routes.post('/token', 
     authController.regenerateToken,
 );