Refactor admin create task
Merge pull request #2516 from techAPJ/patch-1

Refactor admin create task