template changes for user switch, #393