Fixed Email length issue