diff --git a/protected_node.fork.inc b/protected_node.fork.inc
index b55fce9..8fec740 100644
--- a/protected_node.fork.inc
+++ b/protected_node.fork.inc
@@ -124,14 +124,12 @@ function protected_node_enter_any_password() {
   // Enter the detailed description of the protected node password.
   $description = variable_get('protected_node_description', '');
   if (!$description) {
-    // @todo This needs to move to {protected_node} and be loaded along the
-    // other information.
-    // In this case we assume the user may not have the token module
-    // so we do conversions of the node type and title "by hand".
-    $node_title = variable_get('protected_node-' . $node->nid . '-show_title', FALSE);
-    if ($node_title) {
-      // Embellish the title with double quotes.
-      $node_title = '"' . $node_title . '"';
+    if ($node->protected_node_show_title) {
+      // embellish the title with double quotes
+      $node_title = ' "' . $node_title . '"';
+    }
+    else {
+      $node_title = '';
     }
     $description = t('The @node_type @node_title you are trying to view is password protected. Please enter the password below to proceed.',
                      array('@node_type' => $node_type->name, '@node_title' => $node_title));
diff --git a/protected_node.redirect.inc b/protected_node.redirect.inc
index 63c9655..9a53643 100644
--- a/protected_node.redirect.inc
+++ b/protected_node.redirect.inc
@@ -74,13 +74,12 @@ function protected_node_enterpassword() {
   // Enter the detailed description of the protected node password.
   $description = variable_get('protected_node_description', '');
   if (!$description) {
-    // @todo This needs to move to {protected_node} and be loaded along the
-    // other information in this case we assume the user may not have the token
-    // module so we do conversions of the node type and title "by hand".
-    $node_title = variable_get('protected_node-' . $node->nid . '-show_title', FALSE);
-    if ($node_title) {
-      // Embellish the title with double quotes.
-      $node_title = '"' . $node_title . '"';
+    if ($node->protected_node_show_title) {
+      // embellish the title with double quotes
+      $node_title = ' "' . $node_title . '"';
+    }
+    else {
+      $node_title = '';
     }
     $description = t('The @node_type @node_title you are trying to view is password protected. Please enter the password below to proceed.',
                      array('@node_type' => $node_type->name, '@node_title' => $node_title));