Fix to allow apostrophes in username