Fix issue with hyphen in username, #58