Bug fix - adding usernames with apostrophes