diff --git a/enrol/guest/addinstance.php b/enrol/guest/addinstance.php
index fda26d976c0..63fb4067620 100644
--- a/enrol/guest/addinstance.php
+++ b/enrol/guest/addinstance.php
@@ -18,9 +18,10 @@
 /**
  * Adds new instance of enrol_guest to specified course.
  *
- * @package   enrol_guest
- * @copyright 2010 Petr Skoda  {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage guest
+ * @copyright  2010 Petr Skoda  {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 require('../../config.php');
diff --git a/enrol/guest/db/access.php b/enrol/guest/db/access.php
index 81a4fb27761..63635899f01 100644
--- a/enrol/guest/db/access.php
+++ b/enrol/guest/db/access.php
@@ -18,11 +18,14 @@
 /**
  * Capabilities for guest access plugin.
  *
- * @package   enrol_guest
- * @copyright 2010 Petr Skoda {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage guest
+ * @copyright  2010 Petr Skoda  {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die;
+
 $capabilities = array(
 
     'enrol/guest:config' => array(
diff --git a/enrol/guest/lang/en/enrol_guest.php b/enrol/guest/lang/en/enrol_guest.php
index d936f266702..ed9ff47b9f4 100644
--- a/enrol/guest/lang/en/enrol_guest.php
+++ b/enrol/guest/lang/en/enrol_guest.php
@@ -18,9 +18,10 @@
 /**
  * Strings for component 'enrol_guest', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package   enrol_guest
- * @copyright 2010 onwards Petr Skoda  {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage guest
+ * @copyright  2010 onwards Petr Skoda  {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['guest:config'] = 'Configure guest access instances';
diff --git a/enrol/guest/lib.php b/enrol/guest/lib.php
index 2271d1925ba..3423153b2e5 100644
--- a/enrol/guest/lib.php
+++ b/enrol/guest/lib.php
@@ -21,9 +21,10 @@
  * This plugin does not add any entries into the user_enrolments table,
  * the access control is granted on the fly via the tricks in require_login().
  *
- * @package   enrol_guest
- * @copyright 2010 Petr Skoda  {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage guest
+ * @copyright  2010 Petr Skoda  {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die;
@@ -69,7 +70,9 @@ class enrol_guest_plugin extends enrol_plugin {
     public function get_newinstance_link($courseid) {
         global $DB;
 
-        if (!has_capability('moodle/course:enrolconfig', get_context_instance(CONTEXT_COURSE, $courseid, MUST_EXIST))) {
+        $context = get_context_instance(CONTEXT_COURSE, $courseid, MUST_EXIST);
+
+        if (!has_capability('moodle/course:enrolconfig', $context) or !has_capability('enrol/guest:config', $context)) {
             return NULL;
         }
 
diff --git a/enrol/guest/locallib.php b/enrol/guest/locallib.php
index ab9f07b9946..87d8139dd86 100644
--- a/enrol/guest/locallib.php
+++ b/enrol/guest/locallib.php
@@ -18,9 +18,10 @@
 /**
  * Guest access plugin implementation.
  *
- * @package   enrol_guest
- * @copyright 2010 Petr Skoda  {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage guest
+ * @copyright  2010 Petr Skoda  {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die;
diff --git a/enrol/guest/settings.php b/enrol/guest/settings.php
index a161c578753..a8955552fad 100644
--- a/enrol/guest/settings.php
+++ b/enrol/guest/settings.php
@@ -18,9 +18,10 @@
 /**
  * Guest access plugin settings and presets.
  *
- * @package   enrol_guest
- * @copyright 2010 Petr Skoda {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage guest
+ * @copyright  2010 Petr Skoda  {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die;
diff --git a/enrol/guest/version.php b/enrol/guest/version.php
index 4c5241d77d4..46395cf5e07 100644
--- a/enrol/guest/version.php
+++ b/enrol/guest/version.php
@@ -18,9 +18,12 @@
 /**
  * Guest access plugin version specification.
  *
- * @package   enrol_guest
- * @copyright 2010 Petr Skoda {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    enrol
+ * @subpackage guest
+ * @copyright  2010 Petr Skoda  {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die;
+
 $plugin->version = 2010061500;