diff --git a/monkey/monkey_island/cc/services/reporting/report.py b/monkey/monkey_island/cc/services/reporting/report.py
index eabbfb051..fa3bd5f94 100644
--- a/monkey/monkey_island/cc/services/reporting/report.py
+++ b/monkey/monkey_island/cc/services/reporting/report.py
@@ -206,9 +206,11 @@ class ReportService:
     def _get_credentials_from_exploit_telems():
         formatted_creds = []
         for telem in mongo.db.telemetry.find({'telem_category': 'exploit', 'data.info.credentials': {'$exists': True}},
-                                             {'data.info.credentials': 1, 'monkey_guid': 1}):
+                                             {'data.info.credentials': 1, 'data.machine': 1, 'monkey_guid': 1}):
             creds = telem['data']['info']['credentials']
-            origin = telem['data']['machine']['domain_name']
+            _domain_name = telem['data']['machine']['domain_name']
+            _ip = telem['data']['machine']['ip_addr']
+            origin = _domain_name if _domain_name else _ip
             formatted_creds.extend(ReportService._format_creds_for_reporting(telem, creds, origin))
         return formatted_creds