diff --git a/includes/theme.inc b/includes/theme.inc
index e97602f..8328be9 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -363,7 +363,7 @@ function advanced_forum_preprocess_views_view__advanced_forum_topic_list(&$varia
 
   if ($menu_item['map'][0] == 'forum') {
     $forum = $menu_item['map'][1];
-    if ($forum->vid == variable_get('forum_nav_vocabulary') && $forum->tid > 0 && !variable_get('advanced_forum_forum_disabled', FALSE)) {
+    if ($forum->vid == variable_get('forum_nav_vocabulary') && $forum->tid > 0 && !variable_get('advanced_forum_forum_disabled')) {
       $variables['node_create_list'] = theme('advanced_forum_node_type_create_list', array('forum_id' => $forum->tid));
       $variables['forum_description'] = $forum->description;
       $variables['forum_tools'] = advanced_forum_forum_tools($forum->tid);
diff --git a/plugins/tasks/forum.inc b/plugins/tasks/forum.inc
index 427cd2b..7574802 100644
--- a/plugins/tasks/forum.inc
+++ b/plugins/tasks/forum.inc
@@ -16,7 +16,7 @@ function advanced_forum_forum_page_manager_tasks() {
     'get arguments' => 'advanced_forum_forum_get_arguments',
     'get context placeholders' => 'advanced_forum_forum_get_contexts',
     // Allow this to be enabled or disabled:
-    'disabled' => variable_get('advanced_forum_forum_disabled', TRUE),
+    'disabled' => (!variable_get('advanced_forum_forum_disabled')) ? FALSE : TRUE,
     'enable callback' => 'advanced_forum_forum_enable',
     // Allow additional operations
     'operations' => array(
@@ -38,7 +38,7 @@ function advanced_forum_forum_page_manager_tasks() {
  * normal user view process.
  */
 function advanced_forum_forum_menu_alter(&$items, $task) {
-  if (variable_get('advanced_forum_forum_disabled', TRUE)) {
+  if (variable_get('advanced_forum_forum_disabled') == TRUE) {
     return;
   }
 
@@ -114,6 +114,8 @@ function advanced_forum_forum_get_contexts($task, $subtask_id) {
  * Callback to enable/disable the page from the UI.
  */
 function advanced_forum_forum_enable($cache, $status) {
+  if ($status == NULL)
+    $status = FALSE;
   variable_set('advanced_forum_forum_disabled', $status);
 }