diff --git a/manifests/hostmaster.pp b/manifests/hostmaster.pp
index 7b3faaf..f318211 100644
--- a/manifests/hostmaster.pp
+++ b/manifests/hostmaster.pp
@@ -37,13 +37,13 @@ class aegir::hostmaster (
     "${package_name}-hostmaster aegir/db_user string ${database['user']}",
     "${package_name}-hostmaster aegir/webserver select ${server}",
   ]
-  if $email {
+  if $email != '' {
     $debconf_email = ["${package_name}-hostmaster aegir/email string ${email}"]
   }
   else {
     $debconf_email = []
   }
-  if $makefile {
+  if $makefile != '' {
     $debconf_makefile = ["${package_name}-hostmaster aegir/makefile string ${makefile}"]
   }
   else {
@@ -55,7 +55,7 @@ class aegir::hostmaster (
   else {
     $debconf_working_copy = []
   }
-  if $drush_version {
+  if $drush_version != '' {
     $debconf_drush = ["${package_name}-provision aegir/drush_version string ${drush_version}"]
   }
   else {