Index: vhUSER.mac.rou
===================================================================
diff -u -r46365 -r48302
--- vhUSER.mac.rou	(.../vhUSER.mac.rou)	(revision 46365)
+++ vhUSER.mac.rou	(.../vhUSER.mac.rou)	(revision 48302)
@@ -765,12 +765,16 @@
  	quit UserID
  ;
 
-GeefUserIDViaEmail(Email)
+GeefUserIDViaEmail(Email, WijzigDomeinNLnaarBE)
  	new SearchString set SearchString = $zconvert(Email,"U")
+ 	new SearchString2 set SearchString2 = SearchString
+ 	If $G(WijzigDomeinNLnaarBE,0) {
+		set SearchString2 = ##class(TECH.StringUtils).Replace(SearchString, "@VANHOECKE.NL", "@VANHOECKE.BE")
+ 	}
  	new UserID set UserID = ""
  	new Gevonden set Gevonden = 0
  	for { quit:Gevonden  set UserID = $order(^vhUSER("D",UserID)) quit:UserID=""
- 		if $D(^vhUSER("D",UserID,"M")) && ($zconvert($P(^vhUSER("D",UserID,"M"),"\",13),"U")=SearchString) set Gevonden=1
+ 		if $D(^vhUSER("D",UserID,"M")) && (##class(TECH.StringUtils).Equals($zconvert($P(^vhUSER("D",UserID,"M"),"\",13),"U"), SearchString, SearchString2)) set Gevonden=1
  	}
  	if 'Gevonden {
 	 	do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Geen gebruiker gevonden met Email : "_Email))