diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 8b466cfb..651e6793 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -181,6 +181,11 @@ against it. You can run those locally ahead of time with:
 bundle exec rake rubocop
 ```
 
+Or if you want to run them all together at once:
+```sh
+bundle exec rake strings:generate:reference && bundle exec rake lint && bundle exec rake validate && bundle exec rake rubocop
+```
+
 ### Running the unit tests
 
 The unit test suite covers most of the code, as mentioned above please
diff --git a/README.md b/README.md
index 5e8c8774..cdd80018 100644
--- a/README.md
+++ b/README.md
@@ -180,6 +180,20 @@ class { 'bacula::client':
 }
 ```
 
+To exclude Info messages from the logfile.
+
+```puppet
+class { 'bacula::client':
+      messages => { 'Standard-fd' => {
+          daemon   => 'fd',
+          mname    => 'Standard',
+          director => "${director}-dir = all, !skipped, !restored",
+          append   => '"/var/log/bacula/bacula-fd.log" = all, !info, !skipped',
+        },
+      },
+    }
+```
+
 #### Data Encryption (PKI Setup)
 
 Refer to the [PKI
diff --git a/REFERENCE.md b/REFERENCE.md
index 8168b890..bd7db928 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -273,7 +273,6 @@ The following parameters are available in the `bacula::client` class:
 * [`listen_address`](#-bacula--client--listen_address)
 * [`password`](#-bacula--client--password)
 * [`max_concurrent_jobs`](#-bacula--client--max_concurrent_jobs)
-* [`manage_defaults`](#-bacula--client--manage_defaults)
 * [`director_name`](#-bacula--client--director_name)
 * [`autoprune`](#-bacula--client--autoprune)
 * [`file_retention`](#-bacula--client--file_retention)
@@ -383,10 +382,6 @@ Bacula FD option for 'Maximum Concurrent Jobs'
 
 Default value: `2`
 
-##### <a name="-bacula--client--manage_defaults"></a>`manage_defaults`
-
-Setup default message type
-
 ##### <a name="-bacula--client--director_name"></a>`director_name`
 
 Data type: `String`
diff --git a/data/common.yaml b/data/common.yaml
index ed027ac7..96f8842a 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -13,7 +13,7 @@ bacula::client::messages:
     Standard-fd:
       daemon:       'fd'
       mname:        'Standard'
-      director:     "${director_name}-dir = all, !skipped, !restored"
+      director:     "%{trusted.certname}-dir = all, !skipped, !restored"
       append:       '"/var/log/bacula/bacula-fd.log" = all, !skipped'
 bacula::director::packages: []
 
diff --git a/manifests/client.pp b/manifests/client.pp
index fe287fc3..5418a74e 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -36,7 +36,6 @@
 #   Bacula being unable to bind twice to the IPv4 address and fail to start.
 # @param password            A password to use for communication with this File Daemon
 # @param max_concurrent_jobs Bacula FD option for 'Maximum Concurrent Jobs'
-# @param manage_defaults     Setup default message type
 # @param director_name       The hostname of the director for this FD
 # @param autoprune           Bacula FD option for 'AutoPrune'
 # @param file_retention      Bacula FD option for 'File Retention'