Index: VerpakkingsDefinitie/UI/LogInScherm.pas
===================================================================
diff -u -r555 -r556
--- VerpakkingsDefinitie/UI/LogInScherm.pas	(.../LogInScherm.pas)	(revision 555)
+++ VerpakkingsDefinitie/UI/LogInScherm.pas	(.../LogInScherm.pas)	(revision 556)
@@ -7,7 +7,7 @@
   System.Classes, Vcl.Graphics,
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls,
   Main, ApplicationContext, Subscherm,
-  Agent;
+  UserAgent;
 
 type
   TFormLogin = class(TFormSubscherm)
@@ -24,24 +24,23 @@
     procedure PanelLogInMouseUp(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
     procedure PanelButtonEnableChange(Sender: TPanel);
   private
-    FAgent: TAgent;
+    FUserAgent: TUserAgent;
     procedure Login();
   public
-    Constructor Create(AOwner: TComponent; Navigator: TFormMain; ApplicationContext: TApplicationContext; Agent: TAgent);
+    Constructor Create(AOwner: TComponent; Navigator: TFormMain; ApplicationContext: TApplicationContext; UserAgent: TUserAgent);
   end;
 
 implementation
 
 uses
-  Util,
-  UserServerService;
+  Util;
 
 {$R *.dfm}
 
-constructor TFormLogin.Create(AOwner: TComponent; Navigator: TFormMain; ApplicationContext: TApplicationContext; Agent: TAgent);
+constructor TFormLogin.Create(AOwner: TComponent; Navigator: TFormMain; ApplicationContext: TApplicationContext; UserAgent: TUserAgent);
 begin
   inherited Create(AOwner, Navigator, ApplicationContext);
-  self.FAgent := Agent;
+  self.FUserAgent := UserAgent;
 end;
 
 procedure TFormLogin.FormCreate(Sender: TObject);
@@ -87,27 +86,27 @@
 procedure TFormLogin.EditGebruikersnaamChange(Sender: TObject);
 begin
   // We kijken enkel naar gebruikersnaam, want leeg ww zou geldig kunnen zijn
-  PanelLogIn.Enabled := EditGebruikersnaam.Text <> EmptyStr;
+  PanelLogIn.Enabled := (Sender as TEdit).Text <> EmptyStr;
   PanelButtonEnableChange(PanelLogIn);
 end;
 
 procedure TFormLogin.Login();
 var
   ErrorMessage: string;
 begin
-  FAgent.GebruikerAanmelden(EditGebruikersnaam.Text, EditWachtwoord.Text, ApplicationContext.UserServerServiceContext);
+  FUserAgent.GebruikerAanmelden(EditGebruikersnaam.Text, EditWachtwoord.Text, self.ApplicationContext.UserContext);
 
-  if ApplicationContext.UserServerServiceContext.IsOK then
+  if ApplicationContext.UserContext.IsOK then
   begin
     (self.Navigator as TFormMain).NavigeerNaar(Main.NAVZOEKPRODUCTEN);
   end
   else
   begin
     // Login gefaald
-    ErrorMessage := ApplicationContext.UserServerServiceContext.ErrorMessage;
-    if ApplicationContext.UserServerServiceContext.InternalErrorMessage <> '' then
+    ErrorMessage := ApplicationContext.UserContext.ErrorMessage;
+    if ApplicationContext.UserContext.InternalErrorMessage <> '' then
     begin
-      ErrorMessage := ErrorMessage + sLineBreak + ApplicationContext.UserServerServiceContext.InternalErrorMessage;
+      ErrorMessage := ErrorMessage + sLineBreak + ApplicationContext.UserContext.InternalErrorMessage;
     end;
 
     if MessageDlg(ErrorMessage, TMsgDlgType.mtInformation, [mbRetry, mbCancel], 0, mbCancel) = mrRetry then