added site_name and user variables to password templates