Fix problems with generated user data
Fix problems with generated user data

cboling/xos,jermowery/xos,jermowery/xos,cboling/xos,xmaruto/mcord,xmaruto/mcord,xmaruto/mcord,cboling/xos,cboling/xos,xmaruto/mcord,cboling/xos,jermowery/xos,jermowery/xos