2.5 admin-tasks bug fix