diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
index a8e296aee6..fa6d9c43bb 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@@ -1031,7 +1031,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 DateFormat.format("HH:mm", Date(this.startTime))
             ) + "\n"
         }
-        val (temporaryBasal, extendedBolus, _, profile) = pumpSync.expectedPumpState()
+        val temporaryBasal = pumpSync.expectedPumpState().temporaryBasal
         temporaryBasal?.run {
             ret += resourceHelper.gs(
                 R.string.omnipod_common_short_status_temp_basal,
@@ -1169,8 +1169,9 @@ class OmnipodDashPumpPlugin @Inject constructor(
     }
 
     private fun handleTimeChange(): PumpEnactResult {
-        // TODO
-        return PumpEnactResult(injector).success(false).enacted(false).comment("NOT IMPLEMENTED")
+        return profileFunction.getProfile()?.let {
+            setNewBasalProfile(it)
+        } ?: PumpEnactResult(injector).success(true).enacted(false).comment("No profile active")
     }
 
     private fun updateAlertConfiguration(): PumpEnactResult {
@@ -1229,7 +1230,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 expirationReminderEnabled,
                 expirationHours
             ).andThen(
-                podStateManager.updateExpirationAlertSettings(
+                podStateManager.updateLowReservoirAlertSettings(
                     lowReservoirAlertEnabled,
                     lowReservoirAlertUnits
                 )
@@ -1252,14 +1253,20 @@ class OmnipodDashPumpPlugin @Inject constructor(
             "Time, Date and/or TimeZone changed. [timeChangeType=" + timeChangeType.name + ", eventHandlingEnabled=" + eventHandlingEnabled + "]"
         )
 
-        if (timeChangeType == TimeChangeType.TimeChanged) {
-            aapsLogger.info(LTag.PUMP, "Ignoring time change because it is not a DST or TZ change")
-            return
-        } else if (!podStateManager.isPodRunning) {
-            aapsLogger.info(LTag.PUMP, "Ignoring time change because no Pod is active")
-            return
+        when {
+            !eventHandlingEnabled -> {
+                aapsLogger.info(LTag.PUMP, "Ignoring time change because automatic time handling is disabled in configuration")
+                return
+            }
+            timeChangeType == TimeChangeType.TimeChanged -> {
+                aapsLogger.info(LTag.PUMP, "Ignoring time change because it is not a DST or TZ change")
+                return
+            }
+            !podStateManager.isPodRunning -> {
+                aapsLogger.info(LTag.PUMP, "Ignoring time change because no Pod is active")
+                return
+            }
         }
-
         aapsLogger.info(LTag.PUMP, "Handling time change")
 
         commandQueue.customCommand(CommandHandleTimeChange(false), null)
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
index 446d29ac16..e74f87396e 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@@ -631,15 +631,12 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
     }
 
     private fun updateSetTimeButton() {
-        // TODO
-        /*
-        if (podStateManager.isPodRunning && (podStateManager.timeDeviatesMoreThan(Duration.standardMinutes(5)) || commandQueue.isCustomCommandInQueue(CommandHandleTimeChange::class.java))) {
+        if (podStateManager.isActivationCompleted && !podStateManager.sameTimeZone) {
             buttonBinding.buttonSetTime.visibility = View.VISIBLE
-            buttonBinding.buttonSetTime.isEnabled = !podStateManager.isSuspended && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
+            buttonBinding.buttonSetTime.isEnabled = !podStateManager.isSuspended && isQueueEmpty()
         } else {
             buttonBinding.buttonSetTime.visibility = View.GONE
         }
-         */
     }
 
     private fun isAutomaticallySilenceAlertsEnabled(): Boolean {
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
index e77bea3043..f22cddd96a 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt
@@ -65,13 +65,9 @@ class DashInsertCannulaViewModel @Inject constructor(
                 null
 
             super.disposable += omnipodManager.activatePodPart2(basalProgram, expirationHoursBeforeShutdown)
+                .ignoreElements()
+                .andThen(podStateManager.updateExpirationAlertSettings(expirationReminderEnabled, expirationHours))
                 .subscribeBy(
-                    onNext = { podEvent ->
-                        logger.debug(
-                            LTag.PUMP,
-                            "Received PodEvent in Pod activation part 2: $podEvent"
-                        )
-                    },
                     onError = { throwable ->
                         logger.error(LTag.PUMP, "Error in Pod activation part 2", throwable)
                         source.onSuccess(PumpEnactResult(injector).success(false).comment(I8n.textFromException(throwable, resourceHelper)))
@@ -103,7 +99,6 @@ class DashInsertCannulaViewModel @Inject constructor(
                             pumpSerial = podStateManager.uniqueId?.toString() ?: "n/a"
                         )
 
-                        podStateManager.updateExpirationAlertSettings(expirationReminderEnabled, expirationHours)
                         rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_NOT_ATTACHED))
                         source.onSuccess(PumpEnactResult(injector).success(true))
                     }
diff --git a/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml b/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml
index a5aca72dab..0e812a9709 100644
--- a/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml
+++ b/omnipod-dash/src/main/res/xml/omnipod_dash_preferences.xml
@@ -109,12 +109,11 @@
             android:defaultValue="false"
             android:key="@string/key_omnipod_common_suspend_delivery_button_enabled"
             android:title="@string/omnipod_common_preferences_suspend_delivery_button_enabled" />
-<!--
+
         <SwitchPreference
             android:defaultValue="true"
             android:key="@string/key_omnipod_common_time_change_event_enabled"
             android:title="@string/omnipod_common_preferences_time_change_enabled" />
--->
     </PreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file