missed a merge in admin.html