Minor tweaks for admin and user confirmation