diff --git a/target/scripts/start-mailserver.sh b/target/scripts/start-mailserver.sh
index f6ceadf5..51c7b17f 100755
--- a/target/scripts/start-mailserver.sh
+++ b/target/scripts/start-mailserver.sh
@@ -130,6 +130,8 @@ function _register_functions() {
     _register_start_daemon '_start_daemon_mta_sts_daemon'
   fi
 
+  _register_setup_function '_setup_run_user_patches'
+
   # ? >> Daemons
 
   _register_start_daemon '_start_daemon_cron'
@@ -185,7 +187,6 @@ if [[ ! -f /CONTAINER_START ]]; then
   _register_functions
   _check
   _setup
-  _run_user_patches
 else
   # container was restarted
   _early_variables_setup
diff --git a/target/scripts/startup/setup-stack.sh b/target/scripts/startup/setup-stack.sh
index 8c8e6461..92784dd1 100644
--- a/target/scripts/startup/setup-stack.sh
+++ b/target/scripts/startup/setup-stack.sh
@@ -103,7 +103,7 @@ function _setup_apply_fixes_after_configuration() {
   fi
 }
 
-function _run_user_patches() {
+function _setup_run_user_patches() {
   local USER_PATCHES='/tmp/docker-mailserver/user-patches.sh'
 
   if [[ -f ${USER_PATCHES} ]]; then