Simplified deviceId-Fallback and added email address support for global deviceId