diff --git a/data/web/inc/prerequisites.inc.php b/data/web/inc/prerequisites.inc.php
index bd9b908e4..5a5dc30d1 100644
--- a/data/web/inc/prerequisites.inc.php
+++ b/data/web/inc/prerequisites.inc.php
@@ -1,6 +1,7 @@
 <?php
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.inc.php';
 $default_autodiscover_config = $autodiscover_config;
+unset($https_port);
 if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php')) {
   include_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php';
 }
diff --git a/data/web/inc/vars.inc.php b/data/web/inc/vars.inc.php
index 0f48dd610..918a7ba94 100644
--- a/data/web/inc/vars.inc.php
+++ b/data/web/inc/vars.inc.php
@@ -68,7 +68,6 @@ $autodiscover_config = array(
     'port' => $https_port,
   ),
 );
-unset($https_port);
 
 // If false, we will use DEFAULT_LANG
 // Uses HTTP_ACCEPT_LANGUAGE header
diff --git a/docker-compose.yml b/docker-compose.yml
index c64745ba1..4906e606e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -164,7 +164,7 @@ services:
             - sogo
 
     dovecot-mailcow:
-      image: mailcow/dovecot:1.61
+      image: mailcow/dovecot:1.62
       build: ./data/Dockerfiles/dovecot
       cap_add:
         - NET_BIND_SERVICE