bug fix with admin messaging