More fixes to the templates to use `username` and check for g.fas_user instead of fas_user