[FIX] RT-1936 Fixed migrating old username with hyphens
Merge pull request #1316 from kevinejohn/fix/rt-1936

[FIX] RT-1936 Fixed migrating old username with hyphens