diff --git a/client/account/AccountProfilePage.js b/client/account/AccountProfilePage.js
index 7c8f330820a6a..a6fca317a0a7c 100644
--- a/client/account/AccountProfilePage.js
+++ b/client/account/AccountProfilePage.js
@@ -73,7 +73,7 @@ const AccountProfilePage = () => {
 
 	const closeModal = useCallback(() => setModal(null), [setModal]);
 
-	const localPassword = !!(user && user.services && user.services.password && user.services.password.bcrypt.trim());
+	const localPassword = Boolean(user?.services?.password?.bcrypt?.trim());
 	const requirePasswordConfirmation = (values.email !== getUserEmailAddress(user) || !!values.password) && localPassword;
 
 	const erasureType = useSetting('Message_ErasureType');