diff --git a/Global_Indexer/ClassControls.vb b/Global_Indexer/ClassControls.vb
index cd37263..2af4fa5 100644
--- a/Global_Indexer/ClassControls.vb
+++ b/Global_Indexer/ClassControls.vb
@@ -104,6 +104,9 @@ Public Class ClassControls
                 If ClassPatterns.HasComplexPatterns(oSql) Then
                     LOGGER.Debug(" >>sql enthält Platzhalter und wird erst während der Laufzeit gefüllt!", False)
                 Else
+                    oSql = ClassPatterns.ReplaceInternalValues(oSql)
+                    oSql = ClassPatterns.ReplaceUserValues(oSql, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_DOKART_ID)
+
                     Dim oDatatable = ClassDatabase.Return_Datatable_Combined(oSql, oConnectionString, False)
                     oControl.DataSource = oDatatable
                 End If
@@ -416,7 +419,6 @@ Public Class ClassControls
                     oControlSql = ClassPatterns.ReplaceInternalValues(oControlSql)
                     oControlSql = ClassPatterns.ReplaceControlValues(oControlSql, Panel)
 
-
                     LOGGER.Debug("SQL After Preparing: [{0}]", oControlSql)
                     LOGGER.Debug("Setting new value for [{0}]", oControlName)
                     SetDependingControlResult(oControlName, oControlSql, oConnectionId)