fixes
email and custom attributes errors
Merge branch 'working'