Replaced user name with env variable