diff --git a/cmd/commandfuncs.go b/cmd/commandfuncs.go
index 80d00a37..46de9deb 100644
--- a/cmd/commandfuncs.go
+++ b/cmd/commandfuncs.go
@@ -35,7 +35,6 @@ import (
 	"github.com/caddyserver/caddy/v2"
 	"github.com/caddyserver/caddy/v2/caddyconfig"
 	"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
-	"github.com/caddyserver/certmagic"
 	"go.uber.org/zap"
 )
 
@@ -184,15 +183,6 @@ func cmdRun(fl Flags) (int, error) {
 		}
 	}
 
-	// set a fitting User-Agent for ACME requests
-	goModule := caddy.GoModule()
-	cleanModVersion := strings.TrimPrefix(goModule.Version, "v")
-	certmagic.UserAgent = "Caddy/" + cleanModVersion
-
-	// by using Caddy, user indicates agreement to CA terms
-	// (very important, or ACME account creation will fail!)
-	certmagic.DefaultACME.Agreed = true
-
 	// run the initial config
 	err = caddy.Load(config, true)
 	if err != nil {
diff --git a/cmd/main.go b/cmd/main.go
index 4dbbe383..bdc95a45 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -30,9 +30,21 @@ import (
 
 	"github.com/caddyserver/caddy/v2"
 	"github.com/caddyserver/caddy/v2/caddyconfig"
+	"github.com/caddyserver/certmagic"
 	"go.uber.org/zap"
 )
 
+func init() {
+	// set a fitting User-Agent for ACME requests
+	goModule := caddy.GoModule()
+	cleanModVersion := strings.TrimPrefix(goModule.Version, "v")
+	certmagic.UserAgent = "Caddy/" + cleanModVersion
+
+	// by using Caddy, user indicates agreement to CA terms
+	// (very important, or ACME account creation will fail!)
+	certmagic.DefaultACME.Agreed = true
+}
+
 // Main implements the main function of the caddy command.
 // Call this if Caddy is to be the main() if your program.
 func Main() {