diff --git a/manifests/init.pp b/manifests/init.pp
index d89079cc153770fddd7cf2ba68d57c04b20a9a44..f1c1fefa05cdd2cb9093d221a2c69a3f5b81cfed 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -149,8 +149,12 @@ class postfix {
   }
 
   # Default configuration parameters
+  $myorigin = $valid_fqdn ? {
+    ''      => $::fqdn,
+    default => $valid_fqdn,
+  }
   postfix::config {
-    'myorigin':         value => $::fqdn;
+    'myorigin':         value => $myorigin;
     'alias_maps':       value => 'hash:/etc/aliases';
     'inet_interfaces':  value => 'all';
   }