#583 username can't start wit underscore
Merge remote branch 'fork/583-2'