diff --git a/manifests/server.pp b/manifests/server.pp
index 47c7be5..492c6da 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -32,11 +32,19 @@
                     $usershare_allow_guests = '',
                     $users = {},
                     $workgroup = '',
-                    $interfaces = '' ) {
+                    $interfaces = '',
+                    $service_ensure = 'running',
+                    $service_enable = true,
+                    $service_manage = true,
+) {
 
   include samba::server::install
   include samba::server::config
-  include samba::server::service
+  class {'samba::server::service':
+    ensure => $service_ensure,
+    enable => $service_enable,
+    manage => $service_manage,
+  }
 
   $incl    = '/etc/samba/smb.conf'
   $context = '/files/etc/samba/smb.conf'
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
index 68db2d6..4cc6978 100644
--- a/manifests/server/service.pp
+++ b/manifests/server/service.pp
@@ -2,23 +2,28 @@
 #
 class samba::server::service (
   $ensure = running,
-  $enable = true
-) inherits samba::server::params {
+  $enable = true,
+  $manage = true,
 
-  service { $samba::server::params::service_name :
-    ensure     => $ensure,
-    hasstatus  => true,
-    hasrestart => true,
-    enable     => $enable,
-    require    => Class['samba::server::config']
-  }
+) inherits samba::server::params {
 
-  if $samba::server::params::nmbd_name != undef {
-    service { $samba::server::params::nmbd_name :
+  if $manage {
+    service { $samba::server::params::service_name :
       ensure     => $ensure,
-      hasrestart => false,
+      hasstatus  => true,
+      hasrestart => true,
       enable     => $enable,
-      require    => Class['samba::server::config'],
+      require    => Class['samba::server::config']
+    }
+  
+
+    if $samba::server::params::nmbd_name != undef {
+      service { $samba::server::params::nmbd_name :
+        ensure     => $ensure,
+        hasrestart => false,
+        enable     => $enable,
+        require    => Class['samba::server::config'],
+      }
     }
   }
 }