diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp
index ee5620aaaa..3e8549329d 100644
--- a/.vagrant-puppet/manifests/default.pp
+++ b/.vagrant-puppet/manifests/default.pp
@@ -8,9 +8,15 @@
 $icingaVersion = '1.11.2'
 $icinga2Version = '2.0.0'
 
-mysql::database { 'icinga': }
+mysql::database { 'icinga':
+  username => 'icinga',
+  password => 'icinga',
+}
 
-mysql::database { 'icinga2': }
+mysql::database { 'icinga2':
+  username => 'icinga2',
+  password => 'icinga2',
+}
 
 exec{ 'create-pgsql-icinga-db':
   unless  => 'sudo -u postgres psql -tAc "SELECT 1 FROM pg_roles WHERE rolname=\'icinga\'" | grep -q 1',
diff --git a/.vagrant-puppet/modules/mysql/manifests/database.pp b/.vagrant-puppet/modules/mysql/manifests/database.pp
index 1c1a97deea..7e3127cfc5 100644
--- a/.vagrant-puppet/modules/mysql/manifests/database.pp
+++ b/.vagrant-puppet/modules/mysql/manifests/database.pp
@@ -1,23 +1,11 @@
-define mysql::database (
-  $username = 'UNDEF',
-  $password = 'UNDEF'
-) {
+define mysql::database ($username, $password) {
   include mysql
 
-  $user = $username ? {
-    /UNDEF/ => $name,
-    default => $username,
-  }
-  $pass = $password ? {
-    /UNDEF/ => $user,
-    default => $password,
-  }
-
   exec { "create-mysql-${name}-db":
-    unless  => "mysql -u${user} -p${pass} ${name}",
+    unless  => "mysql -u${username} -p${password} ${name}",
     command => "mysql -uroot -e \"CREATE DATABASE ${name}; \
-GRANT SELECT,INSERT,UPDATE,DELETE ON ${name}.* TO ${user}@localhost \
-IDENTIFIED BY '${pass}';\"",
+GRANT SELECT,INSERT,UPDATE,DELETE ON ${name}.* TO ${username}@localhost \
+IDENTIFIED BY '${password}';\"",
     require => Service['mysqld']
   }
 }