BN-1154 Fixed Email issue