Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml
===================================================================
diff -u -r49903 -r49969
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 49903)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 49969)
@@ -95,10 +95,13 @@
 	#dim Resultaat As %Boolean = $$$False
 	
 	If (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname),"daro")) {
-		Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Daro()	
-	}
-	
-	If (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname),"hein","seefelder")) && (DecrypteerRequest.Ref = "") && ((DecrypteerRequest.DataOpt = "")){
+		Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Daro()
+		Set ..Response.Taal = ##class(DOM.enu.Taal).Engels()
+		
+		If ((DecrypteerRequest.Ref = "") || (DecrypteerRequest.DataOpt = "")) {
+			Set ..Response.IsGeldig = $$$False
+		}
+	} ElseIf (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname),"hein","seefelder")) && (DecrypteerRequest.Ref = "") && ((DecrypteerRequest.DataOpt = "")){
 		If ##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname) [ "hein" {
 			Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Hein()
 			Set ..Response.IsLoginFormulierNodig = 1
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Daro.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Daro.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Test/Daro.cls.xml	(revision 49969)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder.Test.Daro">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Personality Daro wordt bepaald door Hostname">
+<Implementation><![CDATA[
+	#dim DecrypteerRequest As WS.Vhisie4.Auth.DecrypteerRequest = ##class(WS.Vhisie4.Auth.DecrypteerRequest).%New()
+	Set DecrypteerRequest.Hostname = "HostnameBevatDaro"
+	
+	#dim Decrypteerder As WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New()
+	#dim DecrypteerResponse As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(DecrypteerRequest)
+	
+	Do $$$AssertEquals(DecrypteerResponse.PersonalityId, ##class(DOM.common.enu.Personality).Daro())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Ongeldig indien geen Ref voor Personality Daro">
+<Implementation><![CDATA[
+	#dim DecrypteerRequest As WS.Vhisie4.Auth.DecrypteerRequest = ##class(WS.Vhisie4.Auth.DecrypteerRequest).%New()
+	Set DecrypteerRequest.Hostname = "HostnameBevatDaro"
+	Set DecrypteerRequest.Ref = ""
+	Set DecrypteerRequest.DataOpt = "RandomDataOpt"
+	
+	#dim Decrypteerder As WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New()
+	#dim DecrypteerResponse As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(DecrypteerRequest)
+	
+	Do $$$AssertFalse(DecrypteerResponse.IsGeldig)
+	Do $$$AssertFalse(DecrypteerResponse.IsContactGegevensFormulierNodig)
+	Do $$$AssertFalse(DecrypteerResponse.IsLoginFormulierNodig)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Ongeldig indien geen DataOpt voor Personality Daro">
+<Implementation><![CDATA[
+	#dim DecrypteerRequest As WS.Vhisie4.Auth.DecrypteerRequest = ##class(WS.Vhisie4.Auth.DecrypteerRequest).%New()
+	Set DecrypteerRequest.Hostname = "HostnameBevatDaro"
+	Set DecrypteerRequest.Ref = "RandomRef"
+	Set DecrypteerRequest.DataOpt = ""
+	
+	#dim Decrypteerder As WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New()
+	#dim DecrypteerResponse As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(DecrypteerRequest)
+	
+	Do $$$AssertFalse(DecrypteerResponse.IsGeldig)
+	Do $$$AssertFalse(DecrypteerResponse.IsContactGegevensFormulierNodig)
+	Do $$$AssertFalse(DecrypteerResponse.IsLoginFormulierNodig)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>