Fix username generation for general case #3089
Merge branch 'develop' of github.com:meedan/meedan-checkdesk into develop