diff --git a/cmd/generate-config/main.go b/cmd/generate-config/main.go
index 24085afaa..7e03b9843 100644
--- a/cmd/generate-config/main.go
+++ b/cmd/generate-config/main.go
@@ -90,6 +90,7 @@ func main() {
 		cfg.Logging[0].Type = "std"
 		cfg.UserAPI.BCryptCost = bcrypt.MinCost
 		cfg.Global.JetStream.InMemory = true
+		cfg.ClientAPI.RegistrationDisabled = false
 		cfg.ClientAPI.RegistrationSharedSecret = "complement"
 		cfg.Global.Presence = config.PresenceOptions{
 			EnableInbound:  true,
diff --git a/setup/config/config_clientapi.go b/setup/config/config_clientapi.go
index 5c2170e60..fd126fa42 100644
--- a/setup/config/config_clientapi.go
+++ b/setup/config/config_clientapi.go
@@ -61,9 +61,10 @@ func (c *ClientAPI) Defaults(generate bool) {
 	c.RecaptchaEnabled = false
 	c.RecaptchaBypassSecret = ""
 	c.RecaptchaSiteVerifyAPI = ""
-	c.RegistrationDisabled = false
+	c.RegistrationDisabled = true
 	c.RegistrationWithoutVerificationEnabled = false
 	if generate {
+		c.RegistrationDisabled = false
 		c.RegistrationWithoutVerificationEnabled = true
 	}
 	c.RateLimiting.Defaults()