diff --git a/hades/templates/job-dbinit.yaml b/hades/templates/job-dbinit.yaml
index 63d49f6..0c8f584 100644
--- a/hades/templates/job-dbinit.yaml
+++ b/hades/templates/job-dbinit.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.dbInit.enabled (eq (printf "%v" .Values.mysql.enabled) "true") }}
+{{- if .Values.dbInit.enabled }}
 apiVersion: batch/v1
 kind: Job
 metadata:
diff --git a/hades/values.yaml b/hades/values.yaml
index 138bdc3..bef2c30 100644
--- a/hades/values.yaml
+++ b/hades/values.yaml
@@ -123,7 +123,7 @@ database:
   host: ""  # Will be set to mysql.fullname if mysql.enabled=true
   port: "3306"
   name: "hades_db"
-  username: "hades_user"
+  username: "mysql_user"
   password: ""  # Leave empty to auto-generate
   # For external database, set mysql.enabled=false and configure above values