Render machine correctly if it doesn't contain @

Created by  Eelco Dolstra  on February 25, 2015
PH3DFCNU2W73FSDAQHS3VXPA474NBQFH2MGL5U6V5VC6CHMQI43AC
Change contents