diff --git a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html
index d86dc998a..d4bd7d0fb 100644
--- a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html
+++ b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.html
@@ -13,7 +13,10 @@
       ></span>
       <app-tooltip
         *ngIf="isWarn"
-        [value]="'chat-component.common.warn-label.tooltip' | translate"
+        [value]="
+          'chat-component.common.warn-label.tooltip'
+            | translate: { supportEmailAddress: supportEmailAddress }
+        "
         color="danger"
       ></app-tooltip>
     </p>
diff --git a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts
index 634b4bddd..638623dde 100644
--- a/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts
+++ b/interfaces/IBF-dashboard/src/app/components/chat/chat.component.ts
@@ -24,6 +24,7 @@ import { PlaceCodeService } from 'src/app/services/place-code.service';
 import { EapAction } from 'src/app/types/eap-action';
 import { EventState } from 'src/app/types/event-state';
 import { TimelineState } from 'src/app/types/timeline-state';
+import { environment } from '../../../environments/environment';
 import { AggregatesService } from '../../services/aggregates.service';
 import { TimelineService } from '../../services/timeline.service';
 import { Actor } from '../../types/chat';
@@ -78,6 +79,7 @@ export class ChatComponent implements OnInit, OnDestroy {
   public lastModelRunDate: string;
   private lastModelRunDateFormat = 'cccc, dd LLLL HH:mm';
   public isWarn = false;
+  public supportEmailAddress = environment.supportEmailAddress;
 
   public actor = Actor;
 
@@ -533,7 +535,7 @@ export class ChatComponent implements OnInit, OnDestroy {
     if (diff[durationUnit] > durationUnitValue + percentageOvertimeAllowed) {
       this.isWarn = true;
     } else {
-      this.isWarn = false;
+      this.isWarn = true;
     }
   };
 
diff --git a/interfaces/IBF-dashboard/src/assets/i18n/en.json b/interfaces/IBF-dashboard/src/assets/i18n/en.json
index abee9a8aa..f961b346a 100644
--- a/interfaces/IBF-dashboard/src/assets/i18n/en.json
+++ b/interfaces/IBF-dashboard/src/assets/i18n/en.json
@@ -88,7 +88,7 @@
     "common": {
       "warn-label": {
         "message": "Hello {{ name }}. The information in this portal is based on the model last run on <strong>{{lastModelRunDate}}</strong>.",
-        "tooltip": "The forecast presented on the portal might not be up to date as the model did not run successfully. Contact IBF support for further information."
+        "tooltip": "The forecast presented on the portal might not be up to date as the model did not run successfully. Contact {{supportEmailAddress}} for further information."
       },
       "revert-selection": "All",
       "save-actions": {
diff --git a/interfaces/IBF-dashboard/src/global.scss b/interfaces/IBF-dashboard/src/global.scss
index 758a15261..7d23bb52e 100644
--- a/interfaces/IBF-dashboard/src/global.scss
+++ b/interfaces/IBF-dashboard/src/global.scss
@@ -282,12 +282,12 @@ app-tooltip {
 }
 
 .tooltip--container {
-  .popover-content {
+  .popover-viewport {
     padding: 8px;
-    overflow: visible;
-  }
+    overflow: hidden;
 
-  ion-label {
-    padding-inline-start: 0;
+    ion-label {
+      padding-inline-start: 0;
+    }
   }
 }