Email addr length bugfix