Improvements on checks in admin/index.php