diff --git a/LSL2/STPROC/NDW_NOTIFICATION_EVENTS.txt b/LSL2/STPROC/NDW_NOTIFICATION_EVENTS.txt
index ca566d3..0bebf84 100644
--- a/LSL2/STPROC/NDW_NOTIFICATION_EVENTS.txt
+++ b/LSL2/STPROC/NDW_NOTIFICATION_EVENTS.txt
@@ -288,44 +288,46 @@ Event PUB_ADD_GROUPS.CLICK()
 	GroupArray = Get_Property(@Window:'.EDT_AD_GROUPS', 'ARRAY')
 	GroupIds   = GroupArray<1>
 	SelGroups  = Dialog_Box('NDW_ACTIVE_DIRECTORY_GROUPS', @Window, GroupIds)
-	Set_Property(@Window:'.EDT_AD_GROUPS', 'LIST', SelGroups)
-	
-	Def         = ""
-	Def<MCOL$>  = -2
-	Def<MROW$>  = -2	
-	Def<MTEXT$> = "Updating LSL user list..."
-	Def<MTYPE$> = "U"
-	MsgUp       = Msg(@window, Def)   ;* display the processing message	
-	
-	GroupArray = Get_Property(@Window:'.EDT_AD_GROUPS', 'ARRAY')
-	GroupIds   = GroupArray<1>
+	If SelGroups NE '' then 
+		Set_Property(@Window:'.EDT_AD_GROUPS', 'LIST', SelGroups)
+		
+		Def         = ""
+		Def<MCOL$>  = -2
+		Def<MROW$>  = -2	
+		Def<MTEXT$> = "Updating LSL user list..."
+		Def<MTYPE$> = "U"
+		MsgUp       = Msg(@window, Def)   ;* display the processing message	
+		
+		GroupArray = Get_Property(@Window:'.EDT_AD_GROUPS', 'ARRAY')
+		GroupIds   = GroupArray<1>
 
-	If GroupIds NE '' then
 		LSLUserNames = ''
 		LSLNames     = ''
-		For each GroupId in GroupIds using @VM
-			MemberList   = Active_Directory_Services('GetADGroupMembersByGroupName', GroupId, 'INFINEON')
-			MemberList   = SRP_Array('Rotate', MemberList, @FM, @VM)
-			ADUserNames  = MemberList<1>
+		If GroupIds NE '' then
+			For each GroupId in GroupIds using @VM
+				MemberList   = Active_Directory_Services('GetADGroupMembersByGroupName', GroupId, 'INFINEON')
+				MemberList   = SRP_Array('Rotate', MemberList, @FM, @VM)
+				ADUserNames  = MemberList<1>
 
-			Open 'DICT.LSL_USERS' to hDict then 
-				For each ADUserName in ADUserNames using @VM setting vPos
-					Query               = 'DOMAIN_USERNAME':@VM:ADUserName:@FM
-					Flag                = ''
-					LSLUsername         = ''
-					Btree.Extract(Query, 'LSL_USERS', hDict, LSLUsername, '', Flag)
-					If LSLUsername NE '' then  LSLUsernames<0, -1> = LSLUsername<0, 1>
-				Next ADUserName
+				Open 'DICT.LSL_USERS' to hDict then 
+					For each ADUserName in ADUserNames using @VM setting vPos
+						Query               = 'DOMAIN_USERNAME':@VM:ADUserName:@FM
+						Flag                = ''
+						LSLUsername         = ''
+						Btree.Extract(Query, 'LSL_USERS', hDict, LSLUsername, '', Flag)
+						If LSLUsername NE '' then  LSLUsernames<0, -1> = LSLUsername<0, 1>
+					Next ADUserName
+				end
+			Next GroupId
+			If LSLUsernames NE '' then
+				LSLNames = Xlate('LSL_USERS', LSLUserNames, 'FIRST_LAST', 'X')
 			end
-		Next GroupId
-		If LSLUsernames NE '' then
-			LSLNames = Xlate('LSL_USERS', LSLUserNames, 'FIRST_LAST', 'X')
 		end
+		Array = LSLUsernames : @FM : LSLNames
+		Set_Property(@Window:'.EDT_LSL_USERS', 'ARRAY', Array)	
+		
+		Msg(@window, MsgUp)         ;* take down the processing message
 	end
-	Array = LSLUsernames : @FM : LSLNames
-	Set_Property(@Window:'.EDT_LSL_USERS', 'ARRAY', Array)	
-	
-	Msg(@window, MsgUp)         ;* take down the processing message
 	
 end event
 
@@ -436,3 +438,4 @@ UnlockRec:
 	
 return
 
+