diff --git a/CHANGELOG.md b/CHANGELOG.md
index d56de4aa8a3..12cd863010b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/).
 - Some of the gathered credentials no longer appear in database plaintext. #1454
 - Encryptor breaking with UTF-8 characters. (Passwords in different languages can be submitted in
   the config successfully now.) #1490
+- Mimikatz collector no longer fails if Azure credential collector is disabled. #1512 #1493
 
 
 ### Security
diff --git a/monkey/infection_monkey/system_info/__init__.py b/monkey/infection_monkey/system_info/__init__.py
index 51da9b869d4..7d065992669 100644
--- a/monkey/infection_monkey/system_info/__init__.py
+++ b/monkey/infection_monkey/system_info/__init__.py
@@ -59,7 +59,7 @@ class InfoCollector(object):
     """
 
     def __init__(self):
-        self.info = {}
+        self.info = {"credentials": {}}
 
     def get_info(self):
         # Collect all hardcoded
@@ -96,8 +96,6 @@ def get_azure_info(self):
                 return
             logger.debug("Harvesting creds if on an Azure machine")
             azure_collector = AzureCollector()
-            if "credentials" not in self.info:
-                self.info["credentials"] = {}
             azure_creds = azure_collector.extract_stored_credentials()
             for cred in azure_creds:
                 username = cred[0]
diff --git a/monkey/infection_monkey/system_info/windows_info_collector.py b/monkey/infection_monkey/system_info/windows_info_collector.py
index ffc720dff5b..f3242922eb8 100644
--- a/monkey/infection_monkey/system_info/windows_info_collector.py
+++ b/monkey/infection_monkey/system_info/windows_info_collector.py
@@ -45,8 +45,7 @@ def get_mimikatz_info(self):
         try:
             credentials = MimikatzCredentialCollector.get_creds()
             if credentials:
-                if "credentials" in self.info:
-                    self.info["credentials"].update(credentials)
+                self.info["credentials"].update(credentials)
                 logger.info("Mimikatz info gathered successfully")
             else:
                 logger.info("No mimikatz info was gathered")