dev/wwannemacher/EUCA-7747, returning canonical ID instead of account number