Moved username formating in own macro.