Partially Revert "Update to use remote_user ..."

This partially reverts commit 7b4d27db6dcb8fee5b48e65bba548601a3ec1027.
"Update to use remote_user instead of user" where I updated the User
command by mistake.