diff --git a/protected_node.fork.inc b/protected_node.fork.inc
index 2393b2b..b4e967f 100644
--- a/protected_node.fork.inc
+++ b/protected_node.fork.inc
@@ -127,10 +127,12 @@ function protected_node_enter_any_password() {
     // 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) {
+    $node_title = $node->protected_node_show_title;
+    if ($node_title == 1) {
       // embellish the title with double quotes
-      $node_title = '"' . $node_title . '"';
+      $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 4c4e0e0..27750ec 100644
--- a/protected_node.redirect.inc
+++ b/protected_node.redirect.inc
@@ -82,10 +82,12 @@ function protected_node_enterpassword() {
     // 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) {
+    $node_title = $node->protected_node_show_title;
+    if ($node_title == 1) {
       // embellish the title with double quotes
-      $node_title = '"' . $node_title . '"';
+      $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));