Fix all admin, user bug