Allow whitespace in accountname
Also allow pipe symbol
Merge branch 'AcountnameWhitespace'