diff --git a/nodejs-functions/src/handlers/automatic-clock-outs/clock_out.js b/nodejs-functions/src/handlers/automatic-clock-outs/clock_out.js
index a98e83a..8a15406 100644
--- a/nodejs-functions/src/handlers/automatic-clock-outs/clock_out.js
+++ b/nodejs-functions/src/handlers/automatic-clock-outs/clock_out.js
@@ -1,23 +1,25 @@
-const _ = require('lodash');
-const CosmosClient = require('@azure/cosmos').CosmosClient;
-const config = require('./config');
-const TimeEntry = require('./time_entry');
-const MsalClient = require('./msal_client');
-const TimeEntryDao = require('./time_entry_dao');
-const SlackClient = require('./slack_client');
-const { CLOCK_OUT_MESSAGE, CLOCK_OUT_MESSAGE_MIDNIGHT } = require('./constants');
+const _ = require("lodash");
+const CosmosClient = require("@azure/cosmos").CosmosClient;
+const config = require("./config");
+const TimeEntry = require("./time_entry");
+const MsalClient = require("./msal_client");
+const TimeEntryDao = require("./time_entry_dao");
+const SlackClient = require("./slack_client");
+const { CLOCK_OUT_MESSAGE, CLOCK_OUT_MESSAGE_MIDNIGHT } = require("./constants");
 
 const doClockOut = async (context) => {
-  context.log(`I am going to check how many entries were not clocked out ${new Date()}`);
+  context.log(
+    `I am going to check how many entries were not clocked out ${new Date()}`
+  );
 
   const { endpoint, key, databaseId } = config;
   const client = new CosmosClient({ endpoint, key });
   const database = client.database(databaseId);
-  const container = database.container('time_entry');
+  const container = database.container("time_entry");
   const timeEntryDao = new TimeEntryDao(database);
 
   const response = await MsalClient.findUsersInMS();
-  const users = response.data;
+  const users = response.data.value;
   const slackUsers = await SlackClient.findUsersInSlack();
 
   const { resources: entries } = await timeEntryDao.getEntriesWithNoEndDate();
@@ -51,17 +53,19 @@ const doClockOut = async (context) => {
     })
   );
 
-  context.log(`I just clocked out ${totalClockOutsExecuted} entries, thanks are not needed...`);
+  context.log(
+    `I just clocked out ${totalClockOutsExecuted} entries, thanks are not needed...`
+  );
 };
 
 const findUserData = (users, id) => {
-  const targetUser = users.find((user) => user.id === id);
-  return targetUser ? { userName: targetUser.name.split(' ')[0], userEmail: targetUser.email } : {};
+  const user = users.find((user) => user.objectId === id);
+  return user ? { userName: user.displayName.split(" ")[0], userEmail: _.first(user.otherMails) } : {};
 };
 
 const findSlackUserId = (slackUsers, email) => {
-  const slackTargetUser = slackUsers.find((slackUser) => slackUser.email === email);
-  return slackTargetUser ? slackTargetUser.id : null;
+  const user = slackUsers.find((slackUser) => slackUser.email === email);
+  return user ? user.id : null;
 };
 
 module.exports = { doClockOut };
diff --git a/nodejs-functions/src/handlers/automatic-clock-outs/config.js b/nodejs-functions/src/handlers/automatic-clock-outs/config.js
index 3fe674c..3674310 100644
--- a/nodejs-functions/src/handlers/automatic-clock-outs/config.js
+++ b/nodejs-functions/src/handlers/automatic-clock-outs/config.js
@@ -6,10 +6,7 @@ const config = {
     clientId: process.env["CLIENT_ID"],
     authority: process.env["AUTHORITY"],
     clientSecret: process.env["CLIENT_SECRET"],
-    slackApiToken: process.env["SLACK_TOKEN_NOTIFY"],
-    userNameMS: process.env["USER_NAME_MS"],
-    userPasswordMS: process.env["USER_PASSWORD_MS"],
-    b2cLogin = process.env["B2C_LOGIN"]
+    slackApiToken: process.env["SLACK_TOKEN_NOTIFY"]
 };
 
 module.exports = config;
diff --git a/nodejs-functions/src/handlers/automatic-clock-outs/msal_client.js b/nodejs-functions/src/handlers/automatic-clock-outs/msal_client.js
index fc8da88..332cb5b 100644
--- a/nodejs-functions/src/handlers/automatic-clock-outs/msal_client.js
+++ b/nodejs-functions/src/handlers/automatic-clock-outs/msal_client.js
@@ -1,45 +1,27 @@
-const axios = require('axios');
-const config = require('./config');
+const axios = require("axios")
+const msal = require('@azure/msal-node');
+const config = require("./config");
+
+const findUsersInMS = async() => {
+    const {clientId, authority, clientSecret} = config;
+    const endpoint = 'https://graph.windows.net/ioetec.onmicrosoft.com'
+    const configuration = {
+        auth: {
+            clientId: clientId,
+            authority: authority,
+            clientSecret: clientSecret
+        }
+    };
+
+    const cca = new msal.ConfidentialClientApplication(configuration);
+    const clientCredentialRequest = {
+        scopes: ['https://graph.windows.net/.default'],
+    };
+    const response = await cca.acquireTokenByClientCredential(clientCredentialRequest)
+    const token = response.accessToken
+    return axios.get(`${endpoint}/users?api-version=1.6&$select=displayName,otherMails,objectId`,
+      { 'headers': { 'Authorization': token } })
+}
+
+module.exports = { findUsersInMS };
 
-const getToken = async () => {
-  const { clientId, userNameMS, userPasswordMS, b2cLogin } = config;
-  const endpoint = b2cLogin;
-
-  const params = new URLSearchParams();
-
-  params.append('username', userNameMS);
-  params.append('password', userPasswordMS);
-  params.append('grant_type', 'password');
-  params.append('scope', clientId);
-  params.append('client_id', clientId);
-  params.append('response_type', 'token');
-
-  const headers = {
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded',
-    },
-  };
-
-  return axios.post(endpoint, params, headers)
-    .then((result) => {
-      return result.data.access_token;
-    })
-    .catch((err) => {
-      console.log(`Invalid request to: ${endpoint}`);
-    });
-};
-
-const findUsersInMS = async () => {
-  const endpoint = 'https://timetracker-api.azurewebsites.net/';
-  const token = await getToken();
-
-  const headers = {
-    headers: {
-      Authorization: `Bearer ${token}`,
-    },
-  };
-
-  return axios.get(`${endpoint}/users`, headers);
-};
-
-module.exports = { findUsersInMS };
\ No newline at end of file
diff --git a/nodejs-functions/src/handlers/automatic-clock-outs/time_entry.js b/nodejs-functions/src/handlers/automatic-clock-outs/time_entry.js
index 3ce7828..d3f88ff 100644
--- a/nodejs-functions/src/handlers/automatic-clock-outs/time_entry.js
+++ b/nodejs-functions/src/handlers/automatic-clock-outs/time_entry.js
@@ -1,4 +1,4 @@
-const moment = require('moment')
+const moment = require("moment")
 
 class TimeEntry {
 
@@ -15,7 +15,7 @@ class TimeEntry {
   }
 
   getMidnightInTimeEntryZone(){
-    return moment(this.timeEntry.start_date).utc().subtract(this.timeEntry.timezone_offset, 'minutes').endOf('day')
+    return moment(this.timeEntry.start_date).utcOffset(this.timeEntry.timezone_offset * -1).endOf('day');
   }
 
   getTimeToClockOutMidnight(){