diff --git a/crates/defguard_mail/src/templates.rs b/crates/defguard_mail/src/templates.rs
index 135f2a191..34111807d 100644
--- a/crates/defguard_mail/src/templates.rs
+++ b/crates/defguard_mail/src/templates.rs
@@ -221,7 +221,10 @@ pub async fn new_account_mail(
     context.insert("url", &enrollment_service_url);
     context.insert("token", enrollment_token);
 
-    // prepare enrollment service URL
+    // Build URL to Proxy's "open desktop" page, with token as query.
+    if let Ok(mut url) = enrollment_service_url.path_segments_mut() {
+        url.push("open-desktop");
+    }
     enrollment_service_url
         .query_pairs_mut()
         .append_pair("token", enrollment_token);
diff --git a/crates/defguard_mail/src/tests.rs b/crates/defguard_mail/src/tests.rs
index 562c246be..cbcd01e21 100644
--- a/crates/defguard_mail/src/tests.rs
+++ b/crates/defguard_mail/src/tests.rs
@@ -128,7 +128,7 @@ fn send_new_account(_: PgPoolOptions, options: PgConnectOptions) {
     set_smtp_settings(&pool).await;
 
     let mut conn = pool.begin().await.unwrap();
-    let url = Url::parse("http://localhost:8000").unwrap();
+    let url = Url::parse("http://localhost:8001").unwrap();
     let context = Context::new();
     let token = "zXc6N1ndXpWFeyBuogiFp1bD1UomAbZc";
     new_account_mail(