diff --git a/internal/resource/obtenant/obtenant_task.go b/internal/resource/obtenant/obtenant_task.go
index 726733dfd..15a532a14 100644
--- a/internal/resource/obtenant/obtenant_task.go
+++ b/internal/resource/obtenant/obtenant_task.go
@@ -1178,7 +1178,7 @@ func (m *OBTenantManager) CreateUserWithCredentials() tasktypes.TaskError {
 			}
 		}
 
-		if standbyROPwd == "" && secret != nil {
+		if standbyROPwd == "" {
 			standbyROPwd = string(secret.Data["password"])
 		}
 
diff --git a/pkg/oceanbase-sdk/const/config/bootstrap.go b/pkg/oceanbase-sdk/const/config/bootstrap.go
index d1f5295e8..00e637b69 100644
--- a/pkg/oceanbase-sdk/const/config/bootstrap.go
+++ b/pkg/oceanbase-sdk/const/config/bootstrap.go
@@ -17,5 +17,5 @@ import (
 )
 
 const (
-	BootstrapTimeout = 600 * time.Second
+	BootstrapTimeout = 1800 * time.Second
 )