update template variable defaults
refactored logic for extra openid params