diff --git a/monkey_island/cc/services/report.py b/monkey_island/cc/services/report.py
index 3c30ba20e..b4d604c3a 100644
--- a/monkey_island/cc/services/report.py
+++ b/monkey_island/cc/services/report.py
@@ -36,10 +36,9 @@ class ReportService:
         SAMBACRY = 3
         SHELLSHOCK = 4
         CONFICKER = 5
-        CROSS_SEGMENT = 6
 
     class WARNINGS_DICT(Enum):
-        ISLAND_CROSS_SEGMENT = 0
+        CROSS_SEGMENT = 0
         TUNNEL = 1
 
     @staticmethod
@@ -395,8 +394,8 @@ class ReportService:
         return ConfigService.get_config_value(['basic_network', 'general', 'local_network_scan'], True)
 
     @staticmethod
-    def get_issues_overview(issues, cross_segment_issues, config_users, config_passwords):
-        issues_byte_array = [False] * 7
+    def get_issues_overview(issues, config_users, config_passwords):
+        issues_byte_array = [False] * 6
 
         for machine in issues:
             for issue in issues[machine]:
@@ -414,22 +413,22 @@ class ReportService:
                 elif issue['type'].endswith('_pth') or issue['type'].endswith('_password'):
                     issues_byte_array[ReportService.ISSUES_DICT.STOLEN_CREDS.value] = True
 
-        if len(cross_segment_issues) != 0:
-            issues_byte_array[ReportService.ISSUES_DICT.CROSS_SEGMENT.value] = True
-
         return issues_byte_array
 
     @staticmethod
-    def get_warnings_overview(issues):
+    def get_warnings_overview(issues, cross_segment_issues):
         warnings_byte_array = [False] * 2
 
         for machine in issues:
             for issue in issues[machine]:
                 if issue['type'] == 'island_cross_segment':
-                    warnings_byte_array[ReportService.WARNINGS_DICT.ISLAND_CROSS_SEGMENT.value] = True
+                    warnings_byte_array[ReportService.WARNINGS_DICT.CROSS_SEGMENT.value] = True
                 elif issue['type'] == 'tunnel':
                     warnings_byte_array[ReportService.WARNINGS_DICT.TUNNEL.value] = True
 
+        if len(cross_segment_issues) != 0:
+            warnings_byte_array[ReportService.WARNINGS_DICT.CROSS_SEGMENT.value] = True
+
         return warnings_byte_array
 
     @staticmethod
@@ -465,15 +464,15 @@ class ReportService:
                         'config_scan': ReportService.get_config_scan(),
                         'monkey_start_time': ReportService.get_first_monkey_time().strftime("%d/%m/%Y %H:%M:%S"),
                         'monkey_duration': ReportService.get_monkey_duration(),
-                        'issues': ReportService.get_issues_overview(issues, cross_segment_issues, config_users, config_passwords),
-                        'warnings': ReportService.get_warnings_overview(issues)
+                        'issues': ReportService.get_issues_overview(issues, config_users, config_passwords),
+                        'warnings': ReportService.get_warnings_overview(issues, cross_segment_issues),
+                        'cross_segment_issues': cross_segment_issues
                     },
                 'glance':
                     {
                         'scanned': ReportService.get_scanned(),
                         'exploited': ReportService.get_exploited(),
-                        'stolen_creds': ReportService.get_stolen_creds(),
-                        'cross_segment_issues': cross_segment_issues
+                        'stolen_creds': ReportService.get_stolen_creds()
                     },
                 'recommendations':
                     {
diff --git a/monkey_island/cc/ui/src/components/pages/ReportPage.js b/monkey_island/cc/ui/src/components/pages/ReportPage.js
index 5c77f9c46..a71f764eb 100644
--- a/monkey_island/cc/ui/src/components/pages/ReportPage.js
+++ b/monkey_island/cc/ui/src/components/pages/ReportPage.js
@@ -26,7 +26,7 @@ class ReportPageComponent extends AuthComponent {
 
   Warning =
     {
-      ISLAND_CROSS_SEGMENT: 0,
+      CROSS_SEGMENT: 0,
       TUNNEL: 1
     };
 
@@ -333,7 +333,7 @@ class ReportPageComponent extends AuthComponent {
               <div>
                 The Monkey uncovered the following possible set of issues:
                 <ul>
-                  {this.state.report.overview.warnings[this.Warning.ISLAND_CROSS_SEGMENT] ?
+                  {this.state.report.overview.warnings[this.Warning.CROSS_SEGMENT] ?
                     <li>Weak segmentation - Machines from different segments are able to
                       communicate.</li> : null}
                   {this.state.report.overview.warnings[this.Warning.TUNNEL] ?
@@ -603,7 +603,7 @@ class ReportPageComponent extends AuthComponent {
     );
   }
 
-  generateCrossSegmentIssue(issue) {
+  generateIslandCrossSegmentIssue(issue) {
     return (
       <li>
         Segment your network and make sure there is no communication between machines from different segments.