diff --git a/packages/cli/src/UserManagement/routes/auth.ts b/packages/cli/src/UserManagement/routes/auth.ts
index a5d865eac0..b808db9102 100644
--- a/packages/cli/src/UserManagement/routes/auth.ts
+++ b/packages/cli/src/UserManagement/routes/auth.ts
@@ -43,7 +43,7 @@ export function authenticationMethods(this: N8nApp): void {
 				throw new Error('Unable to access database.');
 			}
 
-			if (!user || !user.password || !(await compareHash(req.body.password, user.password))) {
+			if (!user?.password || !(await compareHash(req.body.password, user.password))) {
 				// password is empty until user signs up
 				const error = new Error('Wrong username or password. Do you have caps lock on?');
 				// @ts-ignore
diff --git a/packages/cli/src/UserManagement/routes/passwordReset.ts b/packages/cli/src/UserManagement/routes/passwordReset.ts
index be40c3240c..e621ab7b9d 100644
--- a/packages/cli/src/UserManagement/routes/passwordReset.ts
+++ b/packages/cli/src/UserManagement/routes/passwordReset.ts
@@ -55,7 +55,7 @@ export function passwordResetNamespace(this: N8nApp): void {
 			// User should just be able to reset password if one is already present
 			const user = await Db.collections.User.findOne({ email, password: Not(IsNull()) });
 
-			if (!user || !user.password) {
+			if (!user?.password) {
 				Logger.debug(
 					'Request to send password reset email failed because no user was found for the provided email',
 					{ invalidEmail: email },
diff --git a/packages/cli/src/UserManagement/routes/users.ts b/packages/cli/src/UserManagement/routes/users.ts
index d82edc5a2c..447a6867ea 100644
--- a/packages/cli/src/UserManagement/routes/users.ts
+++ b/packages/cli/src/UserManagement/routes/users.ts
@@ -279,7 +279,7 @@ export function usersNamespace(this: N8nApp): void {
 
 			const inviter = users.find((user) => user.id === inviterId);
 
-			if (!inviter || !inviter.email || !inviter.firstName) {
+			if (!inviter?.email || !inviter?.firstName) {
 				Logger.error(
 					'Request to resolve signup token failed because inviter does not exist or is not set up',
 					{