Improved regex matches username