diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php
index 098e6657f6..295e4c036d 100644
--- a/main/inc/lib/main_api.lib.php
+++ b/main/inc/lib/main_api.lib.php
@@ -732,7 +732,9 @@ function api_protect_admin_script($allow_sessions_admins = false) {
 function api_block_anonymous_users() {
     global $_user;
     if (!(isset($_user['user_id']) && $_user['user_id']) || api_is_anonymous($_user['user_id'], true)) {
+      if (api_get_setting('use_custom_pages') != 'true' ){
         require_once api_get_path(INCLUDE_PATH).'header.inc.php';
+      }
         api_not_allowed();
         return false;
     }
diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php
index 1dc7c11e20..c464b13ae6 100644
--- a/main/inc/local.inc.php
+++ b/main/inc/local.inc.php
@@ -616,7 +616,7 @@ if (isset($uidReset) && $uidReset) {    // session data refresh requested
   unset($_SESSION['_user']['uidReset']);
 	$is_platformAdmin = false; $is_allowedCreateCourse = false;
 
-	if (isset($_user['user_id']) && $_user['user_id'] && $_user['user_id'] != 2) // a uid is given (log in succeeded)
+	if (isset($_user['user_id']) && $_user['user_id'] && ! api_is_anonymous()) // a uid is given (log in succeeded)
 	{
 		$user_table     = Database::get_main_table(TABLE_MAIN_USER);
 		$admin_table    = Database::get_main_table(TABLE_MAIN_ADMIN);