Fix bug around admin