added user name and machine name