diff --git a/backend/src/main.rs b/backend/src/main.rs
index 58d22b6eee..0dfda31bcf 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -59,9 +59,6 @@ use tikv_jemallocator::Jemalloc;
 #[global_allocator]
 static GLOBAL: Jemalloc = Jemalloc;
 
-#[cfg(feature = "enterprise")]
-use windmill_common::METRICS_ADDR;
-
 #[cfg(feature = "parquet")]
 use windmill_common::global_settings::OBJECT_STORE_CACHE_CONFIG_SETTING;
 
@@ -901,14 +898,24 @@ Windmill Community Edition {GIT_VERSION}
         };
 
         let metrics_f = async {
-            if METRICS_ENABLED.load(std::sync::atomic::Ordering::Relaxed) {
-                #[cfg(not(feature = "enterprise"))]
+            let enabled = METRICS_ENABLED.load(std::sync::atomic::Ordering::Relaxed);
+            #[cfg(not(all(feature = "enterprise", feature = "prometheus")))]
+            if enabled {
                 tracing::error!("Metrics are only available in the EE, ignoring...");
-
-                #[cfg(feature = "enterprise")]
-                windmill_common::serve_metrics(*METRICS_ADDR, _killpill_phase2_rx, num_workers > 0)
-                    .await;
             }
+
+            #[cfg(all(feature = "enterprise", feature = "prometheus"))]
+            if let Err(e) = windmill_common::serve_metrics(
+                *windmill_common::METRICS_ADDR,
+                _killpill_phase2_rx,
+                num_workers > 0,
+                enabled,
+            )
+            .await
+            {
+                tracing::error!("Error serving metrics: {e:#}");
+            }
+
             Ok(()) as anyhow::Result<()>
         };
 
diff --git a/backend/windmill-common/src/lib.rs b/backend/windmill-common/src/lib.rs
index 802af6196b..1bbc890728 100644
--- a/backend/windmill-common/src/lib.rs
+++ b/backend/windmill-common/src/lib.rs
@@ -155,8 +155,6 @@ pub async fn shutdown_signal(
 }
 
 use tokio::sync::RwLock;
-#[cfg(feature = "prometheus")]
-use tokio::task::JoinHandle;
 use utils::rd_string;
 
 #[cfg(feature = "prometheus")]
@@ -164,23 +162,31 @@ pub async fn serve_metrics(
     addr: SocketAddr,
     mut rx: tokio::sync::broadcast::Receiver<()>,
     ready_worker_endpoint: bool,
-) -> JoinHandle<()> {
-    use std::sync::atomic::Ordering;
-
+    metrics_endpoint: bool,
+) -> anyhow::Result<()> {
+    if !metrics_endpoint && !ready_worker_endpoint {
+        return Ok(());
+    }
     use axum::{
         routing::{get, post},
         Router,
     };
     use hyper::StatusCode;
-    let router = Router::new()
-        .route("/metrics", get(metrics))
-        .route("/reset", post(reset));
+    let router = Router::new();
+
+    let router = if metrics_endpoint {
+        router
+            .route("/metrics", get(metrics))
+            .route("/reset", post(reset))
+    } else {
+        router
+    };
 
     let router = if ready_worker_endpoint {
         router.route(
             "/ready",
             get(|| async {
-                if IS_READY.load(Ordering::Relaxed) {
+                if IS_READY.load(std::sync::atomic::Ordering::Relaxed) {
                     (StatusCode::OK, "ready")
                 } else {
                     (StatusCode::INTERNAL_SERVER_ERROR, "not ready")
@@ -193,8 +199,12 @@ pub async fn serve_metrics(
 
     tokio::spawn(async move {
         tracing::info!("Serving metrics at: {addr}");
-        let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
-        if let Err(e) = axum::serve(listener, router.into_make_service())
+        let listener = tokio::net::TcpListener::bind(addr).await;
+        if let Err(e) = listener {
+            tracing::error!("Error binding to metrics address: {}", e);
+            return;
+        }
+        if let Err(e) = axum::serve(listener.unwrap(), router.into_make_service())
             .with_graceful_shutdown(async move {
                 rx.recv().await.ok();
                 tracing::info!("Graceful shutdown of metrics");
@@ -204,6 +214,8 @@ pub async fn serve_metrics(
             tracing::error!("Error serving metrics: {}", e);
         }
     })
+    .await?;
+    Ok(())
 }
 
 #[cfg(feature = "prometheus")]
diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index 864f3002b1..50f6ee8607 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -615,6 +615,7 @@ pub async fn update_flow_status_after_job_completion_internal(
                             "error while deleting parallel_monitor_lock: {e:#}"
                         ))
                     })?;
+
                     if r.is_some() {
                         tracing::info!(
                             "parallel flow has removed lock on its parent, last ping was {:?}",
diff --git a/frontend/src/lib/components/InstanceSetting.svelte b/frontend/src/lib/components/InstanceSetting.svelte
index 599ca28229..03ac00aa02 100644
--- a/frontend/src/lib/components/InstanceSetting.svelte
+++ b/frontend/src/lib/components/InstanceSetting.svelte
@@ -61,6 +61,8 @@
 	let renewing = false
 	let opening = false
 
+	let to: string = ''
+
 	async function reloadKeyrenewalAttemptInfo() {
 		latestKeyRenewalAttempt = await SettingService.getLatestKeyRenewalAttempt()
 	}
@@ -747,6 +749,30 @@
 				{:else if setting.fieldType == 'smtp_connect'}
 					<div class="flex flex-col gap-4 border rounded p-4">
 						{#if $values[setting.key]}
+							<div class="flex gap-4"
+								><input type="email" bind:value={to} placeholder="contact@windmill.dev" />
+								<Button
+									disabled={to == ''}
+									on:click={async () => {
+										let smtp = $values[setting.key]
+										await SettingService.testSmtp({
+											requestBody: {
+												to,
+												smtp: {
+													host: smtp['smtp_host'],
+													username: smtp['smtp_username'],
+													password: smtp['smtp_password'],
+													port: smtp['smtp_port'],
+													from: smtp['smtp_from'],
+													tls_implicit: smtp['smtp_tls_implicit'],
+													disable_tls: smtp['smtp_disable_tls']
+												}
+											}
+										})
+										sendUserToast('Test email sent')
+									}}>Test SMTP settings</Button
+								></div
+							>
 							<div>
 								<label for="smtp_host" class="block text-sm font-medium">Host</label>
 								<input
diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index 476e7182f5..293fab4e40 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -210,8 +210,6 @@
 		oauths['snowflake_oauth'].connect_config = connect_config
 	}
 
-	let to: string = ''
-
 	async function sendStats() {
 		await SettingService.sendStats()
 		sendUserToast('Usage sent')
@@ -339,32 +337,6 @@
 							{/each}
 						</div>
 					</div>
-					{#if category == 'SMTP'}
-						{@const smtp = $values['smtp_settings']}
-						<div class="flex gap-4"
-							><input type="email" bind:value={to} placeholder="contact@windmill.dev" />
-							<Button
-								disabled={to == '' || !smtp}
-								on:click={async () => {
-									await SettingService.testSmtp({
-										requestBody: {
-											to,
-											smtp: {
-												host: smtp['smtp_host'],
-												username: smtp['smtp_username'],
-												password: smtp['smtp_password'],
-												port: smtp['smtp_port'],
-												from: smtp['smtp_from'],
-												tls_implicit: smtp['smtp_tls_implicit'],
-												disable_tls: smtp['smtp_disable_tls']
-											}
-										}
-									})
-									sendUserToast('Test email sent')
-								}}>Test SMTP settings</Button
-							></div
-						>
-					{/if}
 				</TabContent>
 			{/each}
 		</svelte:fragment>