diff --git a/manifests/server/account_security.pp b/manifests/server/account_security.pp
index a7054dc..9df64c0 100644
--- a/manifests/server/account_security.pp
+++ b/manifests/server/account_security.pp
@@ -1,13 +1,19 @@
 class mysql::server::account_security {
   # Some installations have some default users which are not required.
   # We remove them here. You can subclass this class to overwrite this behavior.
-  database_user { [ "root@${::fqdn}", "root@${::hostname}", 'root@127.0.0.1', 'root@::1',
-                    "@${::fqdn}", "@${::hostname}", '@localhost', '@%' ]:
+  database_user { [ "root@${::fqdn}", 'root@127.0.0.1', 'root@::1',
+                    "@${::fqdn}", '@localhost', '@%' ]:
     ensure  => 'absent',
     require => Class['mysql::config'],
   }
+  if ($::fqdn != $::hostname) {
+    database_user { ["root@${::hostname}", "@${::hostname}"]:
+      ensure  => 'absent',
+      require => Class['mysql::config'],
+    }
+  }
   database { 'test':
     ensure  => 'absent',
     require => Class['mysql::config'],
   }
 }