diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ddbff45..44d01e0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fix unicode characters not rendering correctly in webhooks @mderynck ([#3670](https://github.com/grafana/oncall/pull/3670))
+- UI bug related to time inputs for "current UTC time is in" range escalation policy step ([#3585](https://github.com/grafana/oncall/issues/3585)]
+- MS Teams Connection user profile tab - shouldn't reshow connection steps if already connected ([#2427](https://github.com/grafana/oncall-private/issues/2427))
 - Fix internal schedule detail API to set oncall_now for a schedule in orgs with multiple entries ([#3671](https://github.com/grafana/oncall/pull/3671))
 
 ## v1.3.85 (2024-01-12)
diff --git a/grafana-plugin/src/components/TimeRange/TimeRange.tsx b/grafana-plugin/src/components/TimeRange/TimeRange.tsx
index 28736b83..fdb1a99e 100644
--- a/grafana-plugin/src/components/TimeRange/TimeRange.tsx
+++ b/grafana-plugin/src/components/TimeRange/TimeRange.tsx
@@ -59,6 +59,9 @@ const TimeRange = (props: TimeRangeProps) => {
 
   const handleChangeFrom = useCallback(
     (value: moment.Moment) => {
+      if (!value.isValid()) {
+        return;
+      }
       setFrom(value);
 
       if (value.isSame(to, 'minute')) {
@@ -74,6 +77,9 @@ const TimeRange = (props: TimeRangeProps) => {
 
   const handleChangeTo = useCallback(
     (value: moment.Moment) => {
+      if (!value.isValid()) {
+        return;
+      }
       setTo(value);
 
       if (value.isSame(from, 'minute')) {
diff --git a/grafana-plugin/src/containers/UserSettings/UserSettings.tsx b/grafana-plugin/src/containers/UserSettings/UserSettings.tsx
index 8e0df165..7cf1adb2 100644
--- a/grafana-plugin/src/containers/UserSettings/UserSettings.tsx
+++ b/grafana-plugin/src/containers/UserSettings/UserSettings.tsx
@@ -60,7 +60,7 @@ const UserSettings = observer(({ id, onHide, tab = UserSettingsTab.UserInfo }: U
     isCurrent && organizationStore.currentOrganization?.slack_team_identity && !storeUser.slack_user_identity,
     isCurrent && store.hasFeature(AppFeature.Telegram) && !storeUser.telegram_configuration,
     isCurrent,
-    store.hasFeature(AppFeature.MsTeams),
+    store.hasFeature(AppFeature.MsTeams) && !storeUser.messaging_backends.MSTEAMS,
   ];
 
   const title = (