[1396] More fixes for system update username