diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
index 3cf59637..b2a77f54 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
@@ -26,7 +26,12 @@
     
     <#local linkedIndividual>
         <#if statement.org??>
-            <a itemscope itemtype="http://schema.org/CollegeOrUniversity" href="${profileUrl(statement.uri("org"))}" title="${i18n().organization_name}"><span itemprop="name">${statement.orgName}</span></a>
+			<#assign schemaType = "http://schema.org/Organization" />
+			<#assign subclass = statement.subclass!"" />
+			<#if subclass?contains("Educational") >
+				<#assign schemaType = "http://schema.org/CollegeOrUniversity" />
+			</#if>
+            <a itemscope itemtype="${schemaType}" href="${profileUrl(statement.uri("org"))}" title="${i18n().organization_name}"><span itemprop="name">${statement.orgName}</span></a>
         <#elseif editable>
             <#-- Show the link to the context node only if the user is editing the page. -->
             <a href="${profileUrl(statement.uri("edTraining"))}" title="${i18n().missing_organization}">${i18n().missing_organization}</a>