Merged emailvalidation social

Done