Syntax and template fixes for selfservice API