Index: WSimpl/OBJT/MESService.cls.xml
===================================================================
diff -u -r72966 -r72987
--- WSimpl/OBJT/MESService.cls.xml	(.../MESService.cls.xml)	(revision 72966)
+++ WSimpl/OBJT/MESService.cls.xml	(.../MESService.cls.xml)	(revision 72987)
@@ -29,8 +29,13 @@
 	Try {
 		#dim DataOphaler As APPS.VKP.Maatwerk.LadeRegistratie.impl.IDataOphaler = ..BepaalDataOphaler("")
 		#dim IsOlTagUniek As %Boolean = ..LadeRegistratieService.IsRegistratieCodeUniek(DataOphaler.ExtractRegistratieCodeVanURL(ValidateOlTag.OlTag))	
+		#dim Werkpost As APPS.Halux.common.enu.Werkpost = ""
 		
-		If (IsOlTagUniek) {
+		If $$$Not(ValidateOlTag.WerkPost = "") {
+	 		Set Werkpost = ..BepaalCacheBekendeWerkpost(ValidateOlTag.WerkPost)
+		}
+		
+		If ((IsOlTagUniek) && $$$Not(Werkpost = "")) {
 			Set Reponse.Result = "VALID"
 		} Else {
 			Set Reponse.Result = "INVALID"
Index: vhUnitTest/WSimpl/OBJT/MESService/ValideerOlTag/Test.cls.xml
===================================================================
diff -u -r72708 -r72987
--- vhUnitTest/WSimpl/OBJT/MESService/ValideerOlTag/Test.cls.xml	(.../Test.cls.xml)	(revision 72708)
+++ vhUnitTest/WSimpl/OBJT/MESService/ValideerOlTag/Test.cls.xml	(.../Test.cls.xml)	(revision 72987)
@@ -7,6 +7,7 @@
 <Implementation><![CDATA[
 	Set RegisterOlTagRequest = ##class(WS.OBJT.MES.dto.ValidateOlTagRequest).%New()
 	Set RegisterOlTagRequest.OlTag = "DummyOlTag"
+	Set RegisterOlTagRequest.WerkPost = "Pers L1 LBX"
 	
 	Set LadeRegistratieMock = ##class(vhTest.Mock.APPS.VKP.Maatwerk.impl.LadeRegistratieService).%New()
 	Do LadeRegistratieMock.VerwachtMethodCall("IsRegistratieCodeUniek", RegisterOlTagRequest.OlTag).DanReturn($$$True)	
@@ -20,7 +21,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Ongeldige ValideerOlTag">
+<Method name="Test: Ongeldige ValideerOlTag door reeds bestaande OlTag">
 <Implementation><![CDATA[
 	Set RegisterOlTagRequest = ##class(WS.OBJT.MES.dto.ValidateOlTagRequest).%New()
 	Set RegisterOlTagRequest.OlTag = "DummyOlTag"
@@ -36,6 +37,24 @@
 	Do LadeRegistratieMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Ongeldige ValideerOlTag door ongeldige werkpost">
+<Implementation><![CDATA[
+	Set RegisterOlTagRequest = ##class(WS.OBJT.MES.dto.ValidateOlTagRequest).%New()
+	Set RegisterOlTagRequest.OlTag = "DummyOlTag"
+	Set RegisterOlTagRequest.WerkPost = "DummyWerkpost"
+	
+	Set LadeRegistratieMock = ##class(vhTest.Mock.APPS.VKP.Maatwerk.impl.LadeRegistratieService).%New()
+	Do LadeRegistratieMock.VerwachtMethodCall("IsRegistratieCodeUniek", RegisterOlTagRequest.OlTag).DanReturn($$$True)	
+	
+	Set MESService = ##class(WSimpl.OBJT.MESService).%New(LadeRegistratieMock)
+	#dim Response As WS.OBJT.MES.dto.ValidateOlTagResponse = MESService.ValideerOlTag(RegisterOlTagRequest)
+	
+	Do $$$AssertEquals(Response.Result,"INVALID")
+	
+	Do LadeRegistratieMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>