diff --git a/app/DD_PM_WINDREAM/ClassConfig.vb b/app/DD_PM_WINDREAM/ClassConfig.vb
index 2734370..516f0da 100644
--- a/app/DD_PM_WINDREAM/ClassConfig.vb
+++ b/app/DD_PM_WINDREAM/ClassConfig.vb
@@ -33,4 +33,6 @@ Public Class ClassConfig
     Public Property MonitorSplitter2_Distance As Integer = 270
     Public Property MonitorSplitter3_Distance As Integer = 400
 
+    Public Property LastExportPath As String = ""
+
 End Class
diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb
index 770bb3f..f42fa03 100644
--- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb	
+++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.3.1.0")>
+<Assembly: AssemblyVersion("2.3.2.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb
index 4ed4e4b..91ae375 100644
--- a/app/DD_PM_WINDREAM/frmValidator.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.vb
@@ -2204,10 +2204,8 @@ Public Class frmValidator
             If PROFIL_sortbynewest = True Then
                 oBIT = 1
             End If
-            ' 08.11.2021: Switch back to FNPM_GET_NEXT_DOC_INFO because the prodedure breaks a bunch of installations
-            ' Because it does not check for user rights ........,.....
-            'Dim oSQL = $"EXEC PRPM_GET_NEXT_DOC_INFO {CURRENT_ProfilGUID},{CURRENT_DOC_ID},{USER_ID}"
-            Dim oSQL = $"SELECT * from [dbo].[FNPM_GET_NEXT_DOC_INFO] ({CURRENT_ProfilGUID},{oBIT},{CURRENT_DOC_GUID},'{USER_USERNAME}')"
+            Dim oSQL = $"EXEC PRPM_GET_NEXT_DOC_INFO {CURRENT_ProfilGUID},{CURRENT_DOC_ID},{USER_ID}"
+            'Dim oSQL = $"SELECT * from [dbo].[FNPM_GET_NEXT_DOC_INFO] ({CURRENT_ProfilGUID},{oBIT},{CURRENT_DOC_GUID},'{USER_USERNAME}')"
 
             Dim oDT As DataTable = Database_ECM.GetDatatable(oSQL)
             If oDT.Rows.Count > 0 Then
@@ -3567,7 +3565,12 @@ Public Class frmValidator
                         Try
                             If ButtonExport2Folder_RootFolder <> "" Then
                                 If Directory.Exists(ButtonExport2Folder_RootFolder) Then
-                                    FolderBrowserDialog1.SelectedPath = ButtonExport2Folder_RootFolder
+                                    If CONFIG.Config.LastExportPath <> String.Empty Then
+                                        FolderBrowserDialog1.SelectedPath = CONFIG.Config.LastExportPath
+                                    Else
+                                        FolderBrowserDialog1.SelectedPath = ButtonExport2Folder_RootFolder
+                                    End If
+
                                 Else
                                     LOGGER.Warn($"### Dis/Enabale Export2Path - RootFolder {ButtonExport2Folder_RootFolder} not existing or accessible!###")
                                 End If
@@ -5591,6 +5594,8 @@ Public Class frmValidator
                             End If
                         Next
                     End If
+                    CONFIG.Config.LastExportPath = FolderBrowserDialog1.SelectedPath
+                    CONFIG.Save()
                     MsgBox($"[{oCount}] file/s successfully exported to target [{FolderBrowserDialog1.SelectedPath}]!", MsgBoxStyle.Information, ADDITIONAL_TITLE)
                 End If
             Catch ex As Exception