diff --git a/src/Form/HelpLockForm.php b/src/Form/HelpLockForm.php
index c50273d..9d1ec48 100644
--- a/src/Form/HelpLockForm.php
+++ b/src/Form/HelpLockForm.php
@@ -44,7 +44,7 @@ class HelpLockForm extends EntityConfirmFormBase {
     $args = ['@link' => $link];
     $message = $this->t('The help topic @link has been locked.', $args);
     drupal_set_message($message);
-    $this->getLogger('config_help')->notice($message, $args + [
+    $this->getLogger('config_help')->notice('The help topic @link has been locked.', $args + [
       'link' => $ops_link,
     ]);
 
diff --git a/src/Form/HelpTopicForm.php b/src/Form/HelpTopicForm.php
index 4b5eb72..f629b79 100644
--- a/src/Form/HelpTopicForm.php
+++ b/src/Form/HelpTopicForm.php
@@ -273,15 +273,18 @@ class HelpTopicForm extends EntityForm {
     $args = ['@link' => $link];
     if ($status == SAVED_UPDATED) {
       $message = $this->t('The help topic @link has been updated.', $args);
+      drupal_set_message($message);
+      $this->getLogger('config_help')->notice('The help topic @link has been updated.', $args + [
+        'link' => $ops_link,
+      ]);
     }
     else {
       $message = $this->t('The help topic @link has been added.', $args);
+      drupal_set_message($message);
+      $this->getLogger('config_help')->notice('The help topic @link has been added.', $args + [
+        'link' => $ops_link,
+      ]);
     }
-
-    drupal_set_message($message);
-    $this->getLogger('config_help')->notice($message, $args + [
-      'link' => $ops_link,
-    ]);
   }
 
 }
diff --git a/src/Form/HelpUnlockForm.php b/src/Form/HelpUnlockForm.php
index 0c6fb3a..208e1cd 100644
--- a/src/Form/HelpUnlockForm.php
+++ b/src/Form/HelpUnlockForm.php
@@ -44,7 +44,7 @@ class HelpUnlockForm extends EntityConfirmFormBase {
     $args = ['@link' => $link];
     $message = $this->t('The help topic @link has been unlocked.', $args);
     drupal_set_message($message);
-    $this->getLogger('config_help')->notice($message, $args + [
+    $this->getLogger('config_help')->notice('The help topic @link has been unlocked.', $args + [
       'link' => $ops_link,
     ]);