diff --git a/smtpd/manifests/init.pp b/smtpd/manifests/init.pp
index 38f4eae..01b5e72 100644
--- a/smtpd/manifests/init.pp
+++ b/smtpd/manifests/init.pp
@@ -172,7 +172,7 @@ class smtpd(
       owner  => 'root',
       group  => 'wheel',
       source => $ssl_key,
-      notify => Service['smtpd'],
+      notify => Service[$service],
     }
     file { "${ssl::certs}/smtpd.crt":
       ensure => present,
@@ -180,7 +180,7 @@ class smtpd(
       owner  => 'root',
       group  => 'wheel',
       source => $ssl_cert,
-      notify => Service['smtpd'],
+      notify => Service[$service],
     }
   }
 
@@ -196,7 +196,7 @@ class smtpd(
       mode   => '0700',
       owner  => 'root',
       group  => 'wheel',
-      before => Service['smtpd'],
+      before => Service[$service],
     }
 
     if $gecos == true {
@@ -233,7 +233,7 @@ class smtpd(
       cwd         => '/etc/mail',
       path        => '/bin:/usr/bin:/sbin:/usr/sbin',
       subscribe   => File['/etc/mail/aliases'],
-      before      => Service['smtpd'],
+      before      => Service[$service],
     }
 
     file { '/etc/mail/clients':
@@ -252,7 +252,7 @@ class smtpd(
       cwd         => '/etc/mail',
       path        => '/bin:/usr/bin:/sbin:/usr/sbin',
       subscribe   => File['/etc/mail/clients'],
-      before      => Service['smtpd'],
+      before      => Service[$service],
     }
 
     if $domains {
@@ -297,7 +297,7 @@ define smtpd::aliases($gecos) {
     cwd         => '/etc/mail',
     path        => '/bin:/usr/bin:/sbin:/usr/sbin',
     subscribe   => File["/etc/mail/aliases.${name}"],
-    before      => Service['smtpd'],
+    before      => Service[$smtpd::service],
   }
 
 }
@@ -323,7 +323,7 @@ define smtpd::virtual() {
     cwd         => '/etc/mail',
     path        => '/bin:/usr/bin:/sbin:/usr/sbin',
     subscribe   => File["/etc/mail/virtual.${name}"],
-    before      => Service['smtpd'],
+    before      => Service[$smtpd::service],
   }
 
 }