diff --git a/html/pages/plugin.inc.php b/html/pages/plugin.inc.php
index dcae4aacb..daec96f46 100644
--- a/html/pages/plugin.inc.php
+++ b/html/pages/plugin.inc.php
@@ -10,11 +10,15 @@ if ($vars['view'] == "admin")
 }
 else
 {
-  $plugin = dbFetchRow("SELECT `plugin_name` FROM `plugins` WHERE `plugin_name` = '".$vars['p']."'");
+  $plugin = dbFetchRow("SELECT `plugin_name` FROM `plugins` WHERE `plugin_name` = '".$vars['p']."' AND `plugin_active`='1'");
   if(!empty($plugin))
   {
     require('plugins/'.$plugin['plugin_name'].'/'.$plugin['plugin_name'].'.inc.php');
   }
+  else
+  {
+    print_error( "This plugin is either disabled or not available." );
+  }
 }
 
 ?>
diff --git a/html/pages/plugin/admin.inc.php b/html/pages/plugin/admin.inc.php
index ce92d906c..1773d641d 100644
--- a/html/pages/plugin/admin.inc.php
+++ b/html/pages/plugin/admin.inc.php
@@ -25,7 +25,20 @@ if ($_SESSION['userlevel'] >= '10')
       $plugin_active = 0;
     }
 
-    dbUpdate(array('plugin_active' => $plugin_active), 'plugins', '`plugin_id` = ?', array($plugin_id));
+    if(dbUpdate(array('plugin_active' => $plugin_active), 'plugins', '`plugin_id` = ?', array($plugin_id)))
+    {
+      echo('
+<script type="text/javascript">
+$.ajax({
+    url: "",
+    context: document.body,
+    success: function(s,x){
+        $(this).html(s);
+    }
+});
+</script>
+');
+    }
 
   }