diff --git a/profiles/templates/3.1/5_ac_client_domain/sys-apps/calculate-desktop/logout.stop b/profiles/templates/3.1/5_ac_client_domain/sys-apps/calculate-desktop/logout.stop
index e428195fb..8f9930272 100644
--- a/profiles/templates/3.1/5_ac_client_domain/sys-apps/calculate-desktop/logout.stop
+++ b/profiles/templates/3.1/5_ac_client_domain/sys-apps/calculate-desktop/logout.stop
@@ -9,17 +9,21 @@ variable_value()
 
 ONLINE_USERS="`variable_value desktop.cl_desktop_online_user`"
 
-if [[ -n $ONLINE_USERS ]]
+if [[ -n $ONLINE_USERS ]] || pgrep -f 'xdm/xdm --logout' &>/dev/null
 then
-	ebegin "Logout users" 
-	for user_disp in $(variable_value desktop.cl_desktop_online_data | sed -r "s/;/ /g")
-	do
-		user=$(echo $user_disp | cut -d, -f1)
-		disp=$(echo $user_disp | cut -d, -f2)
-		/usr/sbin/cl-core --method desktop_logout $user &>/dev/null
-		/usr/bin/sessreg -d -l :$disp $user &>/dev/null
-		USER="$user" /usr/share/calculate/xdm/xdm --logout &>/dev/null &
-	done
+	if [[ -n $ONLINE_USERS ]]
+	then
+		ebegin "Logout users" 
+		for user_disp in $(variable_value desktop.cl_desktop_online_data | sed -r "s/;/ /g")
+		do
+			user=$(echo $user_disp | cut -d, -f1)
+			disp=$(echo $user_disp | cut -d, -f2)
+			/usr/sbin/cl-core --method desktop_logout $user &>/dev/null
+			/usr/bin/sessreg -d -l :$disp $user &>/dev/null
+			USER="$user" /usr/share/calculate/xdm/xdm --logout &>/dev/null &
+		done
+		eend 0
+	fi
 	if pgrep -f 'xdm/xdm --logout' &>/dev/null
 	then
 		ebegin "Please wait for complete logout" 
@@ -34,5 +38,4 @@ then
 		done
 		eend 0
 	fi
-	eend 0
 fi