diff --git a/monkey/monkey_island/cc/services/attack/technique_reports/T1003.py b/monkey/monkey_island/cc/services/attack/technique_reports/T1003.py
index 8039a2e76..f3bd9b180 100644
--- a/monkey/monkey_island/cc/services/attack/technique_reports/T1003.py
+++ b/monkey/monkey_island/cc/services/attack/technique_reports/T1003.py
@@ -1,4 +1,5 @@
 from monkey_island.cc.services.attack.technique_reports import AttackTechnique
+from monkey_island.cc.services.reporting.report import ReportService
 from common.utils.attack_utils import ScanStatus
 from monkey_island.cc.database import mongo
 
@@ -23,4 +24,6 @@ class T1003(AttackTechnique):
         else:
             status = ScanStatus.UNSCANNED.value
         data.update(T1003.get_message_and_status(status))
+        data['stolen_creds'] = ReportService.get_stolen_creds()
+        data['stolen_creds'].extend(ReportService.get_ssh_keys())
         return data
diff --git a/monkey/monkey_island/cc/services/attack/technique_reports/T1016.py b/monkey/monkey_island/cc/services/attack/technique_reports/T1016.py
index 9249020dc..885b738cb 100644
--- a/monkey/monkey_island/cc/services/attack/technique_reports/T1016.py
+++ b/monkey/monkey_island/cc/services/attack/technique_reports/T1016.py
@@ -11,7 +11,7 @@ class T1016(AttackTechnique):
     scanned_msg = ""
     used_msg = "Monkey gathered network configurations on systems in the network."
 
-    query = [{'$match': {'telem_category': 'system_info'}},
+    query = [{'$match': {'telem_category': 'system_info', 'data.network_info': {'$exists': True}}},
              {'$project': {'machine': {'hostname': '$data.hostname', 'ips': '$data.network_info.networks'},
                            'networks': '$data.network_info.networks',
                            'netstat': '$data.network_info.netstat'}},
diff --git a/monkey/monkey_island/cc/services/attack/technique_reports/T1082.py b/monkey/monkey_island/cc/services/attack/technique_reports/T1082.py
index 726910789..1aaef57f4 100644
--- a/monkey/monkey_island/cc/services/attack/technique_reports/T1082.py
+++ b/monkey/monkey_island/cc/services/attack/technique_reports/T1082.py
@@ -11,7 +11,7 @@ class T1082(AttackTechnique):
     scanned_msg = ""
     used_msg = "Monkey gathered system info from machines in the network."
 
-    query = [{'$match': {'telem_category': 'system_info'}},
+    query = [{'$match': {'telem_category': 'system_info', 'data.network_info': {'$exists': True}}},
              {'$project': {'machine': {'hostname': '$data.hostname', 'ips': '$data.network_info.networks'},
                            'aws': '$data.aws',
                            'netstat': '$data.network_info.netstat',
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/Helpers.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/Helpers.js
index a8847cc0f..ebe12f25b 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/Helpers.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/Helpers.js
@@ -9,7 +9,10 @@ export function renderMachine(val) {
 /* Function takes data gathered from system info collector and creates a
    string representation of machine from that data. */
 export function renderMachineFromSystemData(data) {
-  let machineStr = data['hostname'] + ' ( ';
+  let machineStr = '';
+  if (typeof data['hostname'] !== 'undefined') {
+    machineStr = data['hostname'] + ' ( ';
+  }
   data['ips'].forEach(function (ipInfo) {
     if (typeof ipInfo === 'object') {
       machineStr += ipInfo['addr'] + ', ';
@@ -17,8 +20,12 @@ export function renderMachineFromSystemData(data) {
       machineStr += ipInfo + ', ';
     }
   });
-  // Replaces " ," with " )" to finish a list of IP's
-  return machineStr.slice(0, -2) + ' )'
+  if (typeof data['hostname'] !== 'undefined') {
+    return machineStr.slice(0, -2) + ' )';
+  } else {
+    // Replaces " ," with " )" to finish a list of IP's
+    return machineStr.slice(0, -2);
+  }
 }
 
 /* Formats telemetry data that contains _id.machine and _id.usage fields into columns
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1003.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1003.js
index 5615c7039..c9c127574 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1003.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1003.js
@@ -17,7 +17,7 @@ class T1003 extends React.Component {
         <br/>
         {this.props.data.status === ScanStatus.USED ?
           <StolenPasswordsComponent
-            data={this.props.reportData.glance.stolen_creds.concat(this.props.reportData.glance.ssh_keys)}/>
+            data={this.props.data.stolen_creds}/>
           : ''}
       </div>
     );
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1082.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1082.js
index 308a18c10..27dec053e 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1082.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1082.js
@@ -12,13 +12,14 @@ class T1082 extends React.Component {
   static getSystemInfoColumns() {
     return ([{
       columns: [
-        {
-          Header: 'Machine',
+        { Header: 'Machine',
           id: 'machine',
           accessor: x => renderMachineFromSystemData(x.machine),
-          style: {'whiteSpace': 'unset'}
-        },
-        {Header: 'Gathered info', id: 'info', accessor: x => renderUsageFields(x.collections), style: {'whiteSpace': 'unset'}}
+          style: {'whiteSpace': 'unset'}},
+        { Header: 'Gathered info',
+          id: 'info',
+          accessor: x => renderUsageFields(x.collections),
+          style: {'whiteSpace': 'unset'}}
       ]
     }])
   }