fix regexp for catching the username