diff --git a/odex25_mobile/odex_mobile/controllers/__init__.py b/odex25_mobile/odex_mobile/controllers/__init__.py
index 8c2cb952a..083c1cb1b 100644
--- a/odex25_mobile/odex_mobile/controllers/__init__.py
+++ b/odex25_mobile/odex_mobile/controllers/__init__.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
-from . import authentication
-from . import web
-from . import attendance
-from . import project_timesheet
-from . import leave
-from . import permission
-from . import loan
-from . import overtime
-from . import pettie
-from . import terms
-from . import firebase_notifications
+# from . import authentication
+# from . import web
+# from . import attendance
+# from . import project_timesheet
+# from . import leave
+# from . import permission
+# from . import loan
+# from . import overtime
+# from . import pettie
+# from . import terms
+# from . import firebase_notifications
 from . import rest_api_v2
diff --git a/odex25_mobile/odex_mobile/controllers/rest_api_v2/authentication.py b/odex25_mobile/odex_mobile/controllers/rest_api_v2/authentication.py
index 2541afe50..f7ea0792e 100644
--- a/odex25_mobile/odex_mobile/controllers/rest_api_v2/authentication.py
+++ b/odex25_mobile/odex_mobile/controllers/rest_api_v2/authentication.py
@@ -115,8 +115,14 @@ class AuthenticationController(http.Controller):
             return http_helper.response(code=400, message="Email must not be empty", success=False)
         user = http.request.env['res.users'].sudo().search([('login', '=', kw.get('email'))])
         if user:
-            user.sudo().action_reset_password()
-            return http_helper.response(message=_("A verification link has been sent to you email account"), data={})
+            if user:
+                try:
+                    user.sudo().with_context(company_id=user.company_id.id).action_reset_password()
+                except Exception as e:
+                    return http_helper.response(message=_(e.__str__()),
+                                                data={})
+                return http_helper.response(message=_("A verification link has been sent to you email account"),
+                                            data={})
         else:
             return http_helper.errcode(code=403, message="Password reset failed")