Merge "Fixed 'cmd user list -v' so it shows the current user."