Environment tweaks

Fixed a couple of issues with account env commands I noticed while debugging against the test cluster. TFS ID 1746319 and TFS ID 1744392