diff --git a/frontend/src/views/domain/cert/components/ObtainCert.vue b/frontend/src/views/domain/cert/components/ObtainCert.vue
index 3230a870..c9804976 100644
--- a/frontend/src/views/domain/cert/components/ObtainCert.vue
+++ b/frontend/src/views/domain/cert/components/ObtainCert.vue
@@ -49,7 +49,7 @@ async function callback(ssl_certificate: string, ssl_certificate_key: string) {
 
 function change_auto_cert(status: boolean) {
     if (status) {
-        domain.add_auto_cert(props.config_name, {domains: name.value.trim().split(' ')}).then(() => {
+        domain.add_auto_cert(props.config_name, {domains: name.value.trim().split(' '), ...data}).then(() => {
             message.success(interpolate($gettext('Auto-renewal enabled for %{name}'), {name: name.value}))
         }).catch(e => {
             message.error(e.message ?? interpolate($gettext('Enable auto-renewal failed for %{name}'), {name: name.value}))
@@ -127,7 +127,7 @@ function log(msg: string) {
 
     (logContainer.value as any as Node).appendChild(para);
 
-    (logContainer.value as any as Element).scroll({top: 320, left: 0, behavior: 'smooth'})
+    (logContainer.value as any as Element).scroll({top: 100000, left: 0, behavior: 'smooth'})
 }
 
 const issue_cert = async (config_name: string, server_name: string, callback: Function) => {
diff --git a/server/api/domain.go b/server/api/domain.go
index 2d1c575b..5ff3708a 100644
--- a/server/api/domain.go
+++ b/server/api/domain.go
@@ -398,6 +398,7 @@ func AddDomainToAutoCert(c *gin.Context) {
 	name := c.Param("name")
 
 	var json struct {
+		model.Cert
 		Domains []string `json:"domains"`
 	}
 
@@ -413,9 +414,11 @@ func AddDomainToAutoCert(c *gin.Context) {
 	}
 
 	err = certModel.Updates(&model.Cert{
-		Name:     name,
-		Domains:  json.Domains,
-		AutoCert: model.AutoCertEnabled,
+		Name:            name,
+		Domains:         json.Domains,
+		AutoCert:        model.AutoCertEnabled,
+		DnsCredentialID: json.DnsCredentialID,
+		ChallengeMethod: json.ChallengeMethod,
 	})
 
 	if err != nil {
diff --git a/server/internal/cert/cert.go b/server/internal/cert/cert.go
index c8afcdaa..6d543ffa 100644
--- a/server/internal/cert/cert.go
+++ b/server/internal/cert/cert.go
@@ -101,6 +101,8 @@ func IssueCert(payload *ConfigPayload, logChan chan string, errChan chan error)
 	}
 
 	switch payload.ChallengeMethod {
+	default:
+		fallthrough
 	case HTTP01:
 		logChan <- "Using HTTP01 challenge provider"
 		err = client.Challenge.SetHTTP01Provider(
diff --git a/server/server.go b/server/server.go
index eed41ead..d11dbe35 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/0xJacky/Nginx-UI/server/analytic"
+	"github.com/0xJacky/Nginx-UI/server/internal/analytic"
 	"github.com/0xJacky/Nginx-UI/server/internal/cert"
 	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
 	"github.com/0xJacky/Nginx-UI/server/model"