CLI - fixed updating machine and user