Tidying up auth-related templates

Template-level fixes