diff --git a/admin/roles/allowassign.php b/admin/roles/allowassign.php
index b9aec1c38eb..a2c046c286e 100755
--- a/admin/roles/allowassign.php
+++ b/admin/roles/allowassign.php
@@ -18,9 +18,6 @@
     $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
     require_capability('moodle/role:manage', $sitecontext);
 
-    $site = get_site();
-    $strmanageroles = get_string('manageroles');
-
 /// form processiong here
 
 /// get all roles
@@ -58,7 +55,7 @@
     $currenttab='allowassign';
     require_once('managetabs.php');
 
-    $table->tablealign = "center";
+    $table->tablealign = 'center';
     $table->cellpadding = 5;
     $table->cellspacing = 0;
     $table->width = '90%';
diff --git a/admin/roles/allowoverride.php b/admin/roles/allowoverride.php
index 6cf229eafc2..b76f48e24c0 100755
--- a/admin/roles/allowoverride.php
+++ b/admin/roles/allowoverride.php
@@ -16,9 +16,6 @@
     $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
     require_capability('moodle/role:manage', $sitecontext);
 
-    $site = get_site();
-    $strmanageroles = get_string('manageroles');
-
 /// form processiong here
 
 /// get all roles
@@ -56,7 +53,7 @@
     $currenttab='allowoverride';
     require_once('managetabs.php');
 
-    $table->tablealign = "center";
+    $table->tablealign = 'center';
     $table->cellpadding = 5;
     $table->cellspacing = 0;
     $table->width = '90%';
diff --git a/admin/roles/assign.php b/admin/roles/assign.php
index 15c9b6052ee..8f7b7cb74f4 100755
--- a/admin/roles/assign.php
+++ b/admin/roles/assign.php
@@ -3,6 +3,7 @@
 
     require_once('../../config.php');
     require_once($CFG->dirroot.'/mod/forum/lib.php');
+    require_once($CFG->libdir.'/adminlib.php');
 
     define("MAX_USERS_PER_PAGE", 5000);
 
@@ -52,7 +53,12 @@
         $course = get_site();
     }
 
-    require_login($courseid);
+    if ($context->contextlevel == CONTEXT_COURSE) {
+        require_login($context->instanceid);
+    } else {
+        require_login();
+    }
+
     require_capability('moodle/role:assign', $context);
 
     $assignableroles = get_assignable_roles($context);
@@ -104,6 +110,11 @@
         $showroles = 1;
         $currenttab = 'assign';
         include_once($CFG->dirroot.'/user/tabs.php');
+    } else if ($context->contextlevel == CONTEXT_SYSTEM) {
+        $adminroot = admin_get_root();
+        admin_externalpage_setup('assignroles', $adminroot);
+        admin_externalpage_print_header($adminroot);
+        print_heading($straction);
     } else {
         $currenttab = '';
         $tabsmode = 'assign';
@@ -253,6 +264,10 @@
         print_table($table);
     }
 
-    print_footer($course);
+    if ($context->contextlevel == CONTEXT_SYSTEM) {
+        admin_externalpage_print_footer($adminroot);
+    } else {
+        print_footer($course);
+    }
 
 ?>