diff --git a/REFERENCE.md b/REFERENCE.md
index f5e24823..8168b890 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -385,12 +385,8 @@ Default value: `2`
 
 ##### <a name="-bacula--client--manage_defaults"></a>`manage_defaults`
 
-Data type: `Boolean`
-
 Setup default message type
 
-Default value: `true`
-
 ##### <a name="-bacula--client--director_name"></a>`director_name`
 
 Data type: `String`
@@ -2194,21 +2190,21 @@ Alias of
 
 ```puppet
 Struct[{
-  mname            => String,
-  append           => Optional[String],
-  catalog          => Optional[String],
-  console          => Optional[String],
-  daemon           => Optional[String],
-  director         => Optional[String],
-  mail             => Optional[String],
-  mailcmd          => Optional[String],
-  mailonsuccess    => Optional[String],
-  mailonsuccesscmd => Optional[String],
-  mailonerror      => Optional[String],
-  mailonerrorcmd   => Optional[String],
-  operator         => Optional[String],
-  operatorcmd      => Optional[String],
-  syslog           => Optional[String],
+    mname            => String,
+    append           => Optional[String],
+    catalog          => Optional[String],
+    console          => Optional[String],
+    daemon           => Optional[String],
+    director         => Optional[String],
+    mail             => Optional[String],
+    mailcmd          => Optional[String],
+    mailonsuccess    => Optional[String],
+    mailonsuccesscmd => Optional[String],
+    mailonerror      => Optional[String],
+    mailonerrorcmd   => Optional[String],
+    operator         => Optional[String],
+    operatorcmd      => Optional[String],
+    syslog           => Optional[String],
 }]
 ```
 
diff --git a/data/common.yaml b/data/common.yaml
index d33583c5..ed027ac7 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -9,6 +9,12 @@ bacula::director::messages:
       console:      'all, !skipped, !saved'
       append:       '"/var/log/bacula/bacula-dir.log" = all, !skipped'
       catalog:      'all'
+bacula::client::messages:
+    Standard-fd:
+      daemon:       'fd'
+      mname:        'Standard'
+      director:     "${director_name}-dir = all, !skipped, !restored"
+      append:       '"/var/log/bacula/bacula-fd.log" = all, !skipped'
 bacula::director::packages: []
 
 bacula::storage::services: 'bacula-sd'
diff --git a/manifests/client.pp b/manifests/client.pp
index cd4ea8d7..fe287fc3 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -54,36 +54,28 @@
 #
 class bacula::client (
   Hash[String, Bacula::Message] $messages,
-  Array[String]           $packages,
-  String                  $services,
-  String                  $default_pool,
-  Optional[String]        $default_pool_full,
-  Optional[String]        $default_pool_inc,
-  Optional[String]        $default_pool_diff,
-  Integer                 $port                = 9102,
-  Array[String[1]]        $listen_address      = [],
-  String                  $password            = 'secret',
-  Integer                 $max_concurrent_jobs = 2,
-  String                  $director_name       = $bacula::director_name,
-  Bacula::Yesno           $autoprune           = true,
-  Bacula::Time            $file_retention      = '45 days',
-  Bacula::Time            $job_retention       = '6 months',
-  String                  $client              = $trusted['certname'],
-  String                  $address             = $facts['networking']['fqdn'],
-  Boolean                 $manage_defaults     = true,
-  Optional[Bacula::Yesno] $pki_signatures      = undef,
-  Optional[Bacula::Yesno] $pki_encryption      = undef,
-  Optional[String]        $pki_keypair         = undef,
-  Optional[String]        $pki_master_key      = undef,
-  Optional[String]        $plugin_dir          = undef,
+  Array[String]                 $packages,
+  String                        $services,
+  String                        $default_pool,
+  Optional[String]              $default_pool_full,
+  Optional[String]              $default_pool_inc,
+  Optional[String]              $default_pool_diff,
+  Integer                       $port                = 9102,
+  Array[String[1]]              $listen_address      = [],
+  String                        $password            = 'secret',
+  Integer                       $max_concurrent_jobs = 2,
+  String                        $director_name       = $bacula::director_name,
+  Bacula::Yesno                 $autoprune           = true,
+  Bacula::Time                  $file_retention      = '45 days',
+  Bacula::Time                  $job_retention       = '6 months',
+  String                        $client              = $trusted['certname'],
+  String                        $address             = $facts['networking']['fqdn'],
+  Optional[Bacula::Yesno]       $pki_signatures      = undef,
+  Optional[Bacula::Yesno]       $pki_encryption      = undef,
+  Optional[String]              $pki_keypair         = undef,
+  Optional[String]              $pki_master_key      = undef,
+  Optional[String]              $plugin_dir          = undef,
 ) inherits bacula {
-  if $manage_defaults {
-    bacula::messages { 'Standard-fd':
-      daemon   => 'fd',
-      director => "${director_name}-dir = all, !skipped, !restored",
-      append   => '"/var/log/bacula/bacula-fd.log" = all, !skipped',
-    }
-  }
   $group    = $bacula::bacula_group
   $conf_dir = $bacula::conf_dir
   $config_file = "${conf_dir}/bacula-fd.conf"