fix BZ923579 - no uuid for user/domain
Merge pull request #1731 from rajatchopra/master

 fix BZ923579