Apply 877066cd3 and 680e1800f to admin.php