Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Unishop.Login.Service.txt
===================================================================
diff -u -r34651 -r36619
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Unishop.Login.Service.txt	(.../WS.EC.Unishop.Login.Service.txt)	(revision 34651)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Unishop.Login.Service.txt	(.../WS.EC.Unishop.Login.Service.txt)	(revision 36619)
@@ -8,6 +8,7 @@
                         <s:element minOccurs="0" name="Gebruiker" type="s:string"/>
                         <s:element minOccurs="0" name="Paswoord" type="s:string"/>
                         <s:element minOccurs="0" name="Taal" type="s:string"/>
+                        <s:element minOccurs="0" name="RemoteIP" type="s:string"/>
                     </s:sequence>
                 </s:complexType>
             </s:element>
Index: WS/EC/Unishop/Login/Service.cls.xml
===================================================================
diff -u -r34656 -r36619
--- WS/EC/Unishop/Login/Service.cls.xml	(.../Service.cls.xml)	(revision 34656)
+++ WS/EC/Unishop/Login/Service.cls.xml	(.../Service.cls.xml)	(revision 36619)
@@ -5,29 +5,69 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>WS.OngeauthenticeerdeWebService</Super>
 
+<Property name="VerkoopAPI">
+<Type>DOM.VKP.VerkoopAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="RefSessieDataBepaler">
+<Type>APPS.EC.impl.RefSessieDataBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SessionService">
+<Type>WS.EC.SessionService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="WebShop">
+<Type>BL.EC.WebShop</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Session">
+<Type>BL.EC.Session</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>VerkoopAPI:DOM.VKP.VerkoopAPI,RefSessieDataBepaler:APPS.EC.impl.RefSessieDataBepaler,SessionService:WS.EC.SessionService,WebShop:BL.EC.WebShop,Session:BL.EC.Session</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..VerkoopAPI = $$$Inject(VerkoopAPI,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
+	Set ..RefSessieDataBepaler = $$$Inject(RefSessieDataBepaler,##class(APPS.EC.impl.RefSessieDataBepaler).%New())
+	Set ..SessionService = $$$Inject(SessionService,##class(WS.EC.SessionService).%New())
+	Set ..WebShop = $$$Inject(WebShop,##class(BL.EC.WebShop).%New())
+	Set ..Session = $$$Inject(Session,##class(BL.EC.Session).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Login">
-<FormalSpec>Gebruiker:%String,Paswoord:%String="",Taal:%String=""</FormalSpec>
+<FormalSpec>Gebruiker:%String,Paswoord:%String="",Taal:%String="",RemoteIP:%String="127.0.0.10"</FormalSpec>
 <ReturnType>WS.EC.Unishop.dto.Session</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	#dim LoginParameters As BL.EC.pxLogIn = ""
-	#dim Session As BL.EC.Session = ##class(BL.EC.Session).%New()
-	#dim CanLogin As BL.EC.pxStatus = Session.LogInUser(Gebruiker, Paswoord, "", Taal,,"127.0.0.10",.LoginParameters)
+	#dim CanLogin As BL.EC.pxStatus = ..Session.LogInUser(Gebruiker, Paswoord, "", Taal,, RemoteIP,.LoginParameters)
 	
 	If '$IsObject(CanLogin) && $IsObject(LoginParameters)
 	{
-		#dim RefSessieData As APPS.EC.dto.RefSessieData = ..GeefRefSessieData(LoginParameters.KlantNr)
-		#dim Ref As %String = ##class(APPS.EC.impl.RefSessieDataBepaler).%New().GeefEncryptedRefSessieData(RefSessieData)		
+		#dim ResultSession AS WS.EC.Unishop.dto.Session = ##class(WS.EC.Unishop.dto.Session).%New()
 		
-		#dim Toegang As Derde.EC.Toegang = ##class(Derde.EC.Toegang).%OpenId(Session.Session.ToegangID)
-
+		#dim RefSessieData As APPS.EC.dto.RefSessieData = ..GeefRefSessieData(LoginParameters.KlantNr)
+		#dim EncryptedRefSessieData As %String = ..RefSessieDataBepaler.GeefEncryptedRefSessieData(RefSessieData)	
 		#dim Klant As DOM.VKP.VanHoeckeKlant = ..GeefKlant(RefSessieData.KlantID)
+		#dim Toegang As Derde.EC.Toegang = ##class(Derde.EC.Toegang).%OpenId(..Session.Session.ToegangID)
 		
-		#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ##class(WS.EC.SessionService).%New().LoginMetEncryptedCredentials(Gebruiker, Toegang.WachtWoord, RefSessieData.KlantID, Taal, Klant.GeefAdres().GeefLandNr(), "127.0.0.10")
+		#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ..SessionService.LoginMetEncryptedCredentials(Gebruiker, Toegang.WachtWoord, RefSessieData.KlantID, Taal, Klant.GeefAdres().GeefLandNr(), RemoteIP)
 		
-		#dim ResultSession AS WS.EC.Unishop.dto.Session = ##class(WS.EC.Unishop.dto.Session).%New()
-		Set ResultSession.Url = ##class(BL.EC.WebShop).%New().GetUnishopURL(Ref, Toegang.GeefID(), Taal) 
+		Set ResultSession.Url = ..WebShop.GetUnishopURL(EncryptedRefSessieData, Toegang.GeefID(), Taal) 
 		Set ResultSession.ID = WebshopSessie.VhintraSessie.SessieSleutel
+		
 		Quit ResultSession 
 	} Else {
 		set Exception = ##class(TECH.Exceptions.InvalidUserInputException).%New("Ongeldige gebruiker of paswoord.")	
@@ -37,12 +77,12 @@
 </Method>
 
 <Method name="GeefRefSessieData">
-<FormalSpec>KlantNr:%String</FormalSpec>
+<FormalSpec>KlantNummer:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>APPS.EC.dto.RefSessieData</ReturnType>
 <Implementation><![CDATA[
 	Set RefSessieData = ##class(APPS.EC.dto.RefSessieData).%New()
-	Set RefSessieData.KlantID = "K||" _KlantNr
+	Set RefSessieData.KlantID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KlantNummer) 
 	Set RefSessieData.Verwerker = ##class(APPS.EC.enu.UniShopVerwerker).VHEPN()
 	Set RefSessieData.WebshopModus = ##class(APPS.EC.enu.WebshopModus).Normaal()
 	Quit RefSessieData
@@ -53,9 +93,7 @@
 <FormalSpec>KlantID:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>DOM.VKP.VanHoeckeKlant</ReturnType>
-<Implementation><![CDATA[
-	#Dim VerkoopAPI As DOM.VKP.VerkoopAPI = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()
-	Quit VerkoopAPI.GeefKlant(KlantID)
+<Implementation><![CDATA[	Quit ..VerkoopAPI.GeefKlant(KlantID)
 ]]></Implementation>
 </Method>
 </Class>