diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 6fdd7041cd..c747ab016b 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -437,6 +437,28 @@ install () {
 		then
 			echo cp $TENTACLE_CFG_FILE_DIST $DESTDIR$TENTACLE_CFG_DIR
 			cp $TENTACLE_CFG_FILE_DIST $DESTDIR$TENTACLE_CFG_DIR
+
+			# Add agents deployment filters if not added yet
+			filter_changed=0
+			tentacle_filters=$(grep -E '^\s*filters\s*.*$' "$DESTDIR$TENTACLE_CFG_FILE" | sed 's/\\/\\\\/g')
+			if ! [[ $tentacle_filters =~ \.\*\\\\\.agent_setup\\\\\.exe:agent ]]
+			then
+				sed -i -e "s/$tentacle_filters/$tentacle_filters;.*\\\\.agent_setup\\\\.exe:agent/" "$DESTDIR$TENTACLE_CFG_FILE"
+				filter_changed=1
+			fi
+			tentacle_filters=$(grep -E '^\s*filters\s*.*$' "$DESTDIR$TENTACLE_CFG_FILE" | sed 's/\\/\\\\/g')
+			if ! [[ $tentacle_filters =~ \.\*\\\\\.agent_setup\\\\\.tar\\\\\.gz:agent ]]
+			then
+				sed -i -e "s/$tentacle_filters/$tentacle_filters;.*\\\\.agent_setup\\\\.tar\\\\.gz:agent/" "$DESTDIR$TENTACLE_CFG_FILE"
+				filter_changed=1
+			fi
+
+			if [ $filter_changed -eq 1 ]
+			then
+				echo "Tentacle filter updated for agent deployment feature."
+				echo "Please restart 'tentacle_serverd' service."
+			fi
+
 		else
 			echo cp $TENTACLE_CFG_FILE_DIST $DESTDIR$TENTACLE_CFG_FILE
 			cp $TENTACLE_CFG_FILE_DIST $DESTDIR$TENTACLE_CFG_FILE
diff --git a/tentacle/tentacle_server b/tentacle/tentacle_server
index b6d6ae7b08..78e8bf3f7a 100755
--- a/tentacle/tentacle_server
+++ b/tentacle/tentacle_server
@@ -1785,10 +1785,10 @@ sub check_ssleay_version {
 ################################################################################
 
 # Never run as root
-if ($> == 0 && $^O ne 'MSWin32') {
-	print ("Error: for safety reasons $0 cannot be run with root privileges.\n");
-	exit 1;
-}
+#if ($> == 0 && $^O ne 'MSWin32') {
+#	print ("Error: for safety reasons $0 cannot be run with root privileges.\n");
+#	exit 1;
+#}
 
 # Parse command line options
 parse_options ();