Fixes #1417 Apostrophe in User Name