Not related to this diff, so just a remark - shouldn't this be accessed via Properties.userNameNonLatin ?