diff --git a/modules/auth/auth.controller.js b/modules/auth/auth.controller.js
index f5fd9cb..b2b0c08 100644
--- a/modules/auth/auth.controller.js
+++ b/modules/auth/auth.controller.js
@@ -39,6 +39,7 @@ async function login(req, res, next) {
 }
 
 async function register(req, res, next) {
+
     function cleanAdminData(user) {
         let cUser = user;
         delete cUser.lastLogin;
@@ -48,35 +49,43 @@ async function register(req, res, next) {
         return cUser;
     }
 
-    try {
-        const values = {
-            phone: req.body.phone,
-            platform: req.body.fbuid
-        };
-        const tokens = securityHelper.generateToken(values);
+    const values = {
+        phone: req.body.phone,
+        platform: req.body.fbuid
+    };
+    const tokens = securityHelper.generateToken(values);
 
-        const data = {
-            refresh_token: tokens.refreshToken,
-            phone: req.body.phone,
-            fbuid: req.body.fbuid,
-            email: req.body.email, 
-            name: req.body.name,
-            surname: req.body.surname,
-            entityid: req.body.entityid,
-            accessibility: req.body.accesssibility
-        };
-        console.log(data);
+    let newUser = req.user;
+    if (!req.user) {
+        try {
+            const data = {
+                refresh_token: tokens.refreshToken,
+                phone: req.body.phone,
+                fbuid: req.body.fbuid,
+                email: req.body.email, 
+                name: req.body.name,
+                surname: req.body.surname,
+                entityid: req.body.entityid,
+                accessibility: req.body.accesssibility
+            };
+            console.log(data);
 
-        let newUser = await authService.extraMethods.createUser(data);
+            newUser = await authService.extraMethods.createUser(data);
+            newUser = cleanAdminData(newUser.toJSON());
+            newUser.token = tokens.token;
+            console.log(newUser);
+            return controllerHelper.handleResultResponse(newUser, null, req.params, res, httpStatus.OK);
+        } catch (error) {
+            console.log(error);
+            controllerHelper.handleErrorResponse(MODULE_NAME, register.name, error, res);
+        }
+    }
+    else {
         newUser = cleanAdminData(newUser.toJSON());
         newUser.token = tokens.token;
-
         console.log(newUser);
-        return controllerHelper.handleResultResponse(newUser, null, req.params, res, httpStatus.OK);
-    } catch (error) {
-        console.log(error);
-        controllerHelper.handleErrorResponse(MODULE_NAME, register.name, error, res);
-    }
+        return controllerHelper.handleResultResponse(req.user, null, req.params, res, httpStatus.OK);    
+    }        
 }
 
 async function regenerateToken(req, res, next) {