diff --git a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb
index 9879307..0eca36f 100644
--- a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb
+++ b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb
@@ -148,13 +148,19 @@ Public Class ClassWindream_allgemein
     End Function
     Public Function Stop_WMCC_andCo()
         Try
-            If WMSESSION_STARTSTOP_STARTUP = True Then
+            ' 04.10.18: Überprüft, ob der Benutzer Mitglied der SERVER_USER Gruppe ist
+            Dim sql = "SELECT T.GUID FROM TBDD_GROUPS_USER T
+                        INNER JOIN TBDD_GROUPS T1 on T1.GUID = T.GROUP_ID
+                        WHERE T1.NAME = 'SERVER_USER' AND T.USER_ID = " & USER_ID
+            Dim userExistsInServerUserGroup = ClassDatabase.Execute_Scalar(sql, MyConnectionString)
+
+            If WMSESSION_STARTSTOP_STARTUP = True And userExistsInServerUserGroup Then
                 Dim owindreamControlCenter = CreateObject("Wmcc.ControlCenter")
                 Dim owindreamIndexService = CreateObject("WMIndexServer.WMIdxSvControl")
-                    owindreamControlCenter.StartVFSService(0)
-                    owindreamIndexService.Shutdown()
-                    owindreamControlCenter.ExitCC(0)
-                  End If
+                owindreamControlCenter.StartVFSService(0)
+                owindreamIndexService.Shutdown()
+                owindreamControlCenter.ExitCC(0)
+            End If
         Catch ex As Exception
             ClassLogger.Add("Error while Stopping WMCC and IndexService: " & ex.Message, True)
         End Try