diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb
index 1df8faf..facdf96 100644
--- a/app/TaskFlow/frmValidator.vb
+++ b/app/TaskFlow/frmValidator.vb
@@ -452,11 +452,9 @@ Public Class frmValidator
                             End If
                         End If
 
-                        bbtniNext.Visibility = BarItemVisibility.Always
 
+                        bbtniNext.Visibility = BarItemVisibility.Never
                         If CURRENT_JUMP_DOC_GUID <> 0 Then
-                            bbtniNext.Visibility = BarItemVisibility.Never
-
                             Amount_Docs2Validate = 1
                         Else
 
@@ -2290,7 +2288,7 @@ Public Class frmValidator
     '        Logger.Error(ex)
     '    End Try
     'End Sub
-    Private Sub Controls2B_EnDisabled_on_Load()
+    Private Sub Controls2B_EnDisabled()
         If LOG_PERF Then PerformanceLogger.Info("Controls2B_EnDisabled_on_Load")
 
         Try
@@ -2318,8 +2316,10 @@ Public Class frmValidator
 
                         Try
                             MyValidationLogger.Debug($"Result of Enable SQL [{oResult}]...")
-                            oControl.Enabled = oResult
+
+                            oControl.Enabled = CBool(oResult)
                         Catch ex As Exception
+                            MyValidationLogger.Warn($"Could not convert value [oResult] to Boolean!")
                             MyValidationLogger.Warn($"Error en/disabling control onLoad: [{ex.Message}]")
                         End Try
 
@@ -2677,14 +2677,14 @@ Public Class frmValidator
                 DatabaseFallback.ExecuteNonQueryECM(sql)
 
                 ' ############ Infos eintragen #################
-                ' txtDateipfad.Text = Document_Path
-                'Dim omsg = $"{ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("remainingOps")}: {Amount_Docs2Validate}"
-                Dim omsg = String.Format(S.Verbleibende_Vorgänge___0_, Amount_Docs2Validate)
 
                 If Amount_Docs2Validate > 0 Then
+                    Dim omsg = String.Format(S.Verbleibende_Vorgänge___0_, Amount_Docs2Validate)
                     bsiInformation.Caption = omsg
+                    bbtniNext.Visibility = BarItemVisibility.Always
                 Else
                     bsiInformation.Caption = "Could not get the amount of remaining docs!"
+                    bbtniNext.Visibility = BarItemVisibility.Never
                 End If
 
                 bsiDocID.Caption = "Document-ID: " & CURRENT_DOC_ID & " - GUID: " & CURRENT_DOC_GUID
@@ -2831,7 +2831,7 @@ Public Class frmValidator
             Catch ex As Exception
                 MyValidationLogger.Error(ex)
             End Try
-
+            Controls2B_EnDisabled()
 
             MyValidationLogger.Debug("frmValidator: LoadNextDocument finished!")
         Catch ex As Exception
@@ -2898,13 +2898,13 @@ Public Class frmValidator
             End If
             SplitContainer1.Panel2Collapsed = True
             If Not IsNothing(DocumentViewer1) Then
-                    DocumentViewer1.Visible = False
-                End If
+                DocumentViewer1.Visible = False
+            End If
 
-                RibbonPageFile.Visible = False
-                Exit Sub
-            Else
-                If Not IsNothing(DocumentViewer1) Then
+            RibbonPageFile.Visible = False
+            Exit Sub
+        Else
+            If Not IsNothing(DocumentViewer1) Then
                 DocumentViewer1.Visible = True
             End If
 
@@ -4012,7 +4012,6 @@ Public Class frmValidator
         '  Refresh_FileList()
         Load_Next_Document(True)
 
-        Controls2B_EnDisabled_on_Load()
         _DependingControl_In_Action = False
         _DependingColumn_In_Action = False