diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index eb21d88f13..0d606e9959 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -266,8 +266,12 @@ class gerrit($vhost_name=$fqdn,
     user     => 'gerrit2',
     password => $mysql_password,
     host     => 'localhost',
-    grant    => 'all',
+    grant    => ['all'],
     charset  => 'latin1',
+    require  => [
+      Class['mysql::server'],
+      Class['mysql::server::account_security'],
+    ],
   }
 
   # Set up apache.