Fix Admin Pending
Merge branch 'Daniel'