diff --git a/awx/main/utils/licensing.py b/awx/main/utils/licensing.py
index 957db79c3b..67cbbd5978 100644
--- a/awx/main/utils/licensing.py
+++ b/awx/main/utils/licensing.py
@@ -340,6 +340,7 @@ class Licenser(object):
                 )
                 license._attrs['subscription_name'] = subscription_name
                 license._attrs['satellite'] = satellite
+                license._attrs['valid_key'] = True
                 license.update(
                     license_date=int(sub.end_date.strftime('%s'))
                 )
@@ -371,7 +372,8 @@ class Licenser(object):
         available_instances = int(attrs.get('instance_count', None) or 0)
         attrs['current_instances'] = current_instances
         attrs['available_instances'] = available_instances
-        attrs['free_instances'] = max(0, available_instances - current_instances)
+        free_instances = (available_instances - current_instances)
+        attrs['free_instances'] = max(0, free_instances)
 
         license_date = int(attrs.get('license_date', 0) or 0)
         current_date = int(time.time())
@@ -381,7 +383,7 @@ class Licenser(object):
             attrs['grace_period_remaining'] = time_remaining
         else:
             attrs['grace_period_remaining'] = (license_date + 2592000) - current_date
-        attrs['compliant'] = bool(time_remaining > 0 and attrs['free_instances'] >= 0)
+        attrs['compliant'] = bool(time_remaining > 0 and free_instances >= 0)
         attrs['date_warning'] = bool(time_remaining < self.LICENSE_TIMEOUT)
         attrs['date_expired'] = bool(time_remaining <= 0)
         return attrs
diff --git a/awx/ui/client/src/license/license.partial.html b/awx/ui/client/src/license/license.partial.html
index 931b4d4c2c..19876674c8 100644
--- a/awx/ui/client/src/license/license.partial.html
+++ b/awx/ui/client/src/license/license.partial.html
@@ -58,7 +58,13 @@
 					{{license.license_info.current_instances}}
 					</div>
 				</div>
-				<div class="License-field License-greenText" ng-show='license.license_info.available_instances < 9999999'>
+				<div class="License-field License-greenText" ng-show='license.license_info.available_instances < 9999999 && compliant'>
+					<div class="License-field--label" translate>Hosts Remaining</div>
+					<div class="License-field--content">
+					{{license.license_info.free_instances}}
+					</div>
+				</div>
+				<div class="License-field License-redText" ng-show='license.license_info.free_instances < 1 && !compliant'>
 					<div class="License-field--label" translate>Hosts Remaining</div>
 					<div class="License-field--content">
 					{{license.license_info.free_instances}}