various user and template fixes