User check should only be in cli.py, not here
Merge pull request #8466 from techhat/cloudapi

User check should only be in cli.py, not here