Allow for user names to be surrounded with <> not just []