remove dirty hack, add spaces override for pinserver name #1505