#463 re-worked SYSTEM_USER