diff --git a/zerver/lib/management.py b/zerver/lib/management.py
index 35e042ef81..26e358d787 100644
--- a/zerver/lib/management.py
+++ b/zerver/lib/management.py
@@ -88,7 +88,8 @@ You can use the command list_realms to find ID of the realms in this server."""
                                (options["realm_id"],))
 
     def get_users(self, options: Dict[str, Any], realm: Optional[Realm],
-                  is_bot: Optional[bool]=None) -> List[UserProfile]:
+                  is_bot: Optional[bool]=None,
+                  include_deactivated: bool=False) -> List[UserProfile]:
         if "all_users" in options:
             all_users = options["all_users"]
 
@@ -103,6 +104,8 @@ You can use the command list_realms to find ID of the realms in this server."""
 
             if all_users:
                 user_profiles = UserProfile.objects.filter(realm=realm)
+                if not include_deactivated:
+                    user_profiles = user_profiles.filter(is_active=True)
                 if is_bot is not None:
                     return user_profiles.filter(is_bot=is_bot)
                 return user_profiles
diff --git a/zerver/management/commands/send_password_reset_email.py b/zerver/management/commands/send_password_reset_email.py
index f987c01d28..c870dd27c2 100644
--- a/zerver/management/commands/send_password_reset_email.py
+++ b/zerver/management/commands/send_password_reset_email.py
@@ -26,7 +26,7 @@ class Command(ZulipBaseCommand):
         else:
             realm = self.get_realm(options)
             try:
-                users = self.get_users(options, realm)
+                users = self.get_users(options, realm, is_bot=False)
             except CommandError as error:
                 if str(error) == "You have to pass either -u/--users or -a/--all-users.":
                     raise CommandError("You have to pass -u/--users or -a/--all-users or --entire-server.")
diff --git a/zerver/management/commands/sync_ldap_user_data.py b/zerver/management/commands/sync_ldap_user_data.py
index 7155ecd947..82a914ef60 100644
--- a/zerver/management/commands/sync_ldap_user_data.py
+++ b/zerver/management/commands/sync_ldap_user_data.py
@@ -41,7 +41,8 @@ class Command(ZulipBaseCommand):
     def handle(self, *args: Any, **options: Any) -> None:
         if options.get('realm_id') is not None:
             realm = self.get_realm(options)
-            user_profiles = self.get_users(options, realm, is_bot=False)
+            user_profiles = self.get_users(options, realm, is_bot=False,
+                                           include_deactivated=True)
         else:
             user_profiles = UserProfile.objects.select_related().filter(is_bot=False)
         sync_ldap_user_data(user_profiles)
diff --git a/zerver/tests/test_management_commands.py b/zerver/tests/test_management_commands.py
index d6d457ca10..704e310262 100644
--- a/zerver/tests/test_management_commands.py
+++ b/zerver/tests/test_management_commands.py
@@ -82,8 +82,8 @@ class TestZulipBaseCommand(ZulipTestCase):
         self.assertEqual(get_user_profile_by_email(email), user_profile)
 
     def get_users_sorted(self, options: Dict[str, Any], realm: Optional[Realm],
-                         is_bot: Optional[bool]=None) -> List[UserProfile]:
-        user_profiles = self.command.get_users(options, realm, is_bot=is_bot)
+                         **kwargs: Any) -> List[UserProfile]:
+        user_profiles = self.command.get_users(options, realm, **kwargs)
         return sorted(user_profiles, key = lambda x: x.email)
 
     def test_get_users(self) -> None:
@@ -116,9 +116,30 @@ class TestZulipBaseCommand(ZulipTestCase):
         with self.assertRaisesRegex(CommandError, error_message):
             self.command.get_users(dict(users=user_emails, all_users=True), None)
 
-        expected_user_profiles = sorted(UserProfile.objects.filter(realm=self.zulip_realm),
+        # Test the default mode excluding bots and deactivated users
+        expected_user_profiles = sorted(UserProfile.objects.filter(realm=self.zulip_realm,
+                                                                   is_active=True, is_bot=False),
                                         key = lambda x: x.email)
-        user_profiles = self.get_users_sorted(dict(users=None, all_users=True), self.zulip_realm)
+        user_profiles = self.get_users_sorted(dict(users=None, all_users=True),
+                                              self.zulip_realm,
+                                              is_bot=False)
+        self.assertEqual(user_profiles, expected_user_profiles)
+
+        # Test the default mode excluding bots and deactivated users
+        expected_user_profiles = sorted(UserProfile.objects.filter(realm=self.zulip_realm,
+                                                                   is_active=True),
+                                        key = lambda x: x.email)
+        user_profiles = self.get_users_sorted(dict(users=None, all_users=True),
+                                              self.zulip_realm)
+        self.assertEqual(user_profiles, expected_user_profiles)
+
+        # Test include_deactivated
+        expected_user_profiles = sorted(UserProfile.objects.filter(realm=self.zulip_realm,
+                                                                   is_bot=False),
+                                        key = lambda x: x.email)
+        user_profiles = self.get_users_sorted(dict(users=None, all_users=True),
+                                              self.zulip_realm,
+                                              is_bot=False, include_deactivated=True)
         self.assertEqual(user_profiles, expected_user_profiles)
 
         error_message = "You have to pass either -u/--users or -a/--all-users."