Added updating of SystemUser