Index: AAPClient/UI/DrieKnoppenScherm.dfm
===================================================================
diff -u -r330 -r395
--- AAPClient/UI/DrieKnoppenScherm.dfm	(.../DrieKnoppenScherm.dfm)	(revision 330)
+++ AAPClient/UI/DrieKnoppenScherm.dfm	(.../DrieKnoppenScherm.dfm)	(revision 395)
@@ -114,7 +114,7 @@
     Left = 0
     Top = 0
     Width = 480
-    Height = 57
+    Height = 65
     Align = alTop
     BevelEdges = [beBottom]
     BevelOuter = bvNone
@@ -123,7 +123,7 @@
     TabOrder = 1
     object lblGebruiker: TLabel
       Left = 195
-      Top = 11
+      Top = 22
       Width = 89
       Height = 35
       Alignment = taCenter
Index: AAPClient/UI/PopupScherm.pas
===================================================================
diff -u -r324 -r395
--- AAPClient/UI/PopupScherm.pas	(.../PopupScherm.pas)	(revision 324)
+++ AAPClient/UI/PopupScherm.pas	(.../PopupScherm.pas)	(revision 395)
@@ -20,6 +20,7 @@
     lblActie2: TLabel;
     dbgPopup: TDBGrid;
     dsPopup: TDataSource;
+    tmrAutoSluiten: TTimer;
     procedure pnlbtnActie1Click(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure pnlbtnActie2Click(Sender: TObject);
@@ -28,6 +29,7 @@
     procedure lblActie1Click(Sender: TObject);
     procedure lblActie2Click(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure tmrAutoSluitenTimer(Sender: TObject);
   private
     fDimmerForm: TfmDimmerForm;
   public
@@ -55,6 +57,7 @@
   fDimmerForm.Enabled := false;
   fDimmerForm.Left := Self.Left - 40;
   fDimmerForm.Top := Self.Top - 40;
+  tmrAutoSluiten.Enabled := true;
   fDimmerForm.Show;
 end;
 
@@ -94,4 +97,10 @@
   CloseModal;
 end;
 
+procedure TfmPopupScherm.tmrAutoSluitenTimer(Sender: TObject);
+begin
+  if lblActie1.Color = clGreen then
+    Close;
+end;
+
 end.
Index: AAPClient/ProScan.dproj.local
===================================================================
diff -u -r392 -r395
--- AAPClient/ProScan.dproj.local	(.../ProScan.dproj.local)	(revision 392)
+++ AAPClient/ProScan.dproj.local	(.../ProScan.dproj.local)	(revision 395)
@@ -134,15 +134,15 @@
     <Transaction>2020/04/21 13:48:23.000.846,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2020/04/21 13:48:39.000.235,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
     <Transaction>2020/04/21 13:48:57.000.462,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
-    <Transaction>2020/05/29 11:41:39.278,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
-    <Transaction>2020/05/29 11:42:20.248,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/05/29 11:42:47.154,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
-    <Transaction>2020/06/02 10:32:11.124,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
-    <Transaction>2020/06/02 10:34:06.051,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/06/02 10:34:24.522,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
-    <Transaction>2020/06/03 17:24:09.708,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
-    <Transaction>2020/06/03 17:24:20.352,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2020/06/03 17:25:05.147,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2020/05/29 11:41:39.000.278,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2020/05/29 11:42:20.000.248,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
+    <Transaction>2020/05/29 11:42:47.000.154,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2020/06/02 10:32:11.000.124,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2020/06/02 10:34:06.000.051,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
+    <Transaction>2020/06/02 10:34:24.000.522,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2020/06/03 17:24:09.000.708,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2020/06/03 17:24:20.000.352,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
+    <Transaction>2020/06/03 17:25:05.000.147,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="UI"/>
@@ -174,8 +174,8 @@
     <File Path="UI\UiContext.pas"/>
     <File Path="WS"/>
     <File Path="WS\Agent.pas"/>
-    <File Path="WS\GebruikerService.pas"/>
     <File Path="WS\DnaCodeService.pas"/>
+    <File Path="WS\GebruikerService.pas"/>
     <File Path="ProScanMain.pas"/>
     <File Path="ProScanMain.dfm"/>
   </ProjectSortOrder>
Index: AAPClient/UI/PopupScherm.dfm
===================================================================
diff -u -r341 -r395
--- AAPClient/UI/PopupScherm.dfm	(.../PopupScherm.dfm)	(revision 341)
+++ AAPClient/UI/PopupScherm.dfm	(.../PopupScherm.dfm)	(revision 395)
@@ -163,4 +163,11 @@
     Left = 24
     Top = 360
   end
+  object tmrAutoSluiten: TTimer
+    Enabled = False
+    Interval = 2999
+    OnTimer = tmrAutoSluitenTimer
+    Left = 184
+    Top = 264
+  end
 end
Index: AAPClient/ProScan.dproj
===================================================================
diff -u -r393 -r395
--- AAPClient/ProScan.dproj	(.../ProScan.dproj)	(revision 393)
+++ AAPClient/ProScan.dproj	(.../ProScan.dproj)	(revision 395)
@@ -70,7 +70,7 @@
 			<DCC_RemoteDebug>true</DCC_RemoteDebug>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
-			<Debugger_RunParams>displaymode=desktop server=cacheaccept2010</Debugger_RunParams>
+			<Debugger_RunParams>displaymode=desktop server=cache01</Debugger_RunParams>
 			<Icon_MainIcon>ProScan_Icon.ico</Icon_MainIcon>
 			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
 			<VerInfo_Locale>1033</VerInfo_Locale>
@@ -189,6 +189,9 @@
 					<Platform value="Win64">False</Platform>
 					<Platform value="Win32">True</Platform>
 				</Platforms>
+				<UnitTesting>
+					<TestProjectName>E:\svn\Delphi\AAPClient\Test\ProScanTests.dproj</TestProjectName>
+				</UnitTesting>
 			</BorlandProject>
 			<ProjectFileVersion>12</ProjectFileVersion>
 		</ProjectExtensions>