Implementing new fix for null FB email field