Follow-up from admin UI authentication buttons PR