Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml
===================================================================
diff -u -r57760 -r58210
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 57760)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 58210)
@@ -114,8 +114,9 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim Resultaat As %Boolean = $$$False
+	Set Personality = ##class(DOM.common.enu.Personality.AutoComplete).%New()
 	If (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname), "daro")) {
-		Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Daro()
+		Set ..Response.PersonalityId = Personality.Daro
 		Set ..Response.Taal = ##class(DOM.enu.Taal).Engels()
 		
 		If ((DecrypteerRequest.Ref = "") || (DecrypteerRequest.DataOpt = "")) {
@@ -124,41 +125,44 @@
 			Set ..Response.IsGeldig = $$$True	
 		}
 		Set Resultaat = ..Response.IsGeldig
-	} ElseIf (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname),"hein","seefelder","zweygart")) && ((DecrypteerRequest.DataOpt = "")){
+	} ElseIf (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname),"hein","seefelder","zweygart","jbarth")) && ((DecrypteerRequest.DataOpt = "")){
 		If ##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname) [ "hein" {
-			Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Hein()
+			Set ..Response.PersonalityId = Personality.Hein
 			Set ..Response.IsLoginFormulierNodig = $$$True
 		} Else {
 			Set ..Response.IsContactGegevensFormulierNodig = $$$False
 			Set ..Response.IsLoginFormulierNodig = $$$False
 			If ##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname) [ "seefelder" {
-				Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Seefelder()
+				Set ..Response.PersonalityId = Personality.Seefelder
+			} Elseif (##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname) [ "jbarth") {
+				Set ..Response.PersonalityId = Personality.JBarth
 			} Else {
-				Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Zweygart()
+			
+				Set ..Response.PersonalityId = Personality.Zweygart
 			}
 		}
 		Set ..Response.IsGeldig = $$$True
 		Set ..Response.Taal = "D"
 		Set ..Response.ToegelatenLadetypes = ..HandelToegelatenLadetypesBepaler.Bepaal(..Response.PersonalityId)
 		Set Resultaat = ..Response.IsGeldig
 	} ElseIf (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname), "kisch")) {
-		Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Kisch()
+		Set ..Response.PersonalityId = Personality.Kisch
 		Set ..Response.Taal = ##class(DOM.enu.Taal).Nederlands()
 		Set ..Response.IsContactGegevensFormulierNodig = $$$False
 		Set ..Response.IsLoginFormulierNodig = $$$False
 		Set ..Response.IsGeldig = $$$Not((DecrypteerRequest.Ref = "") || (DecrypteerRequest.DataOpt = ""))
 		
 		Set Resultaat = ..Response.IsGeldig
 	} ElseIf (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname), "beslagdesign")) {
-		Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).BeslagDesign()
+		Set ..Response.PersonalityId = Personality.BeslagDesign
 		Set ..Response.Taal = ##class(DOM.enu.Taal).Zweeds()
 		Set ..Response.IsContactGegevensFormulierNodig = $$$False
 		Set ..Response.IsLoginFormulierNodig = $$$False
 		Set ..Response.IsGeldig = $$$True
 		
 		Set Resultaat = ..Response.IsGeldig
 	} ElseIf (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname), "beslagteknikk")) {
-		Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Beslagteknikk()
+		Set ..Response.PersonalityId = Personality.Beslagteknikk
 		Set ..Response.Taal = ##class(DOM.enu.Taal).Noors()
 		Set ..Response.IsContactGegevensFormulierNodig = $$$False
 		Set ..Response.IsLoginFormulierNodig = $$$False
@@ -167,23 +171,23 @@
 		Set Resultaat = ..Response.IsGeldig
 
 	} ElseIf (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname), "galimberti")) {
-		Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Galimberti()
+		Set ..Response.PersonalityId = Personality.Galimberti
 		Set ..Response.Taal = "I" // niet ##class(DOM.enu.Taal).Italiaans() gebruiken, want dat is 'IT' en niet afgesproken met ITR
 		Set ..Response.IsContactGegevensFormulierNodig = $$$False
 		Set ..Response.IsLoginFormulierNodig = $$$False
 		Set ..Response.IsGeldig = $$$True
 		
 		Set Resultaat = ..Response.IsGeldig
 	} ElseIf (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname), "pavanello")) {
-		Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Pavanello()
+		Set ..Response.PersonalityId = Personality.Pavanello
 		Set ..Response.Taal = "I" // niet ##class(DOM.enu.Taal).Italiaans() gebruiken, want dat is 'IT' en niet afgesproken met ITR
 		Set ..Response.IsContactGegevensFormulierNodig = $$$False
 		Set ..Response.IsLoginFormulierNodig = $$$True
 		Set ..Response.IsGeldig = $$$True
 
 		Set Resultaat = ..Response.IsGeldig
 	} ElseIf (##class(TECH.StringUtils).Contains(##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname), "ferexpert")) {
-		Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Ferexpert()
+		Set ..Response.PersonalityId = Personality.Ferexpert
 		Set ..Response.Taal = "I" // niet ##class(DOM.enu.Taal).Italiaans() gebruiken, want dat is 'IT' en niet afgesproken met ITR
 		Set ..Response.IsContactGegevensFormulierNodig = $$$False
 		Set ..Response.IsLoginFormulierNodig = $$$True
@@ -192,7 +196,7 @@
 		Set Resultaat = ..Response.IsGeldig
 	} ElseIf (DecrypteerRequest.Hostname = "") {
 		Set ..Response.IsGeldig = $$$False
-	} ElseIf ((DecrypteerRequest.Ref = "") && $$$Not(##class(TECH.StringUtils).Equals(DecrypteerRequest.Header.PersonalityId,##class(DOM.common.enu.Personality).Hein(),##class(DOM.common.enu.Personality).Seefelder(),##class(DOM.common.enu.Personality).Zweygart()))) {
+	} ElseIf ((DecrypteerRequest.Ref = "") && $$$Not(##class(TECH.StringUtils).Equals(DecrypteerRequest.Header.PersonalityId,Personality.Hein,Personality.Seefelder,Personality.Zweygart,Personality.JBarth))) {
 		Set ..Response.IsGeldig = $$$False
 	} ElseIf (DecrypteerRequest.DataOpt = "") {
 		Set ..Response.IsContactGegevensFormulierNodig = $$$True