updated username and passwords to accept <%= %> tags within values