diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index 99aea0c3ab..e33cbc63f6 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-04 Dario Rodriguez <dario.rodriguez@artica.es>
+
+	* pandora_agent_installer: Modified agent isntaller to deal with 
+	specified user installation. 
+
 2011-04-04 Dario Rodriguez <dario.rodriguez@artica.es>
 
 	* plugins/pandora_update: Modified plugin for agent autoupdate.
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 1172ad7802..2b20e8e327 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -294,11 +294,11 @@ install () {
 	chmod 755 $PANDORA_BASE$PANDORA_EXEC_BIN
 	if [ "$OS_NAME" = "FreeBSD" ]
 	then
-		chown root:wheel $PANDORA_BASE$PANDORA_BIN
-		chown root:wheel $PANDORA_BASE$PANDORA_EXEC_BIN
+		chown $PANDORA_USER:wheel $PANDORA_BASE$PANDORA_BIN
+		chown $PANDORA_USER:wheel $PANDORA_BASE$PANDORA_EXEC_BIN
 	else
-		chown root:root $PANDORA_BASE$PANDORA_BIN
-		chown root:root $PANDORA_BASE$PANDORA_EXEC_BIN
+		chown $PANDORA_USER:root $PANDORA_BASE$PANDORA_BIN
+		chown $PANDORA_USER:root $PANDORA_BASE$PANDORA_EXEC_BIN
 	fi
 
 	echo "Copying Pandora FMS Agent configuration file to $PANDORA_BASE$PANDORA_CFG/pandora_agent.conf..."
@@ -339,7 +339,7 @@ install () {
 		chmod -R 770 $PANDORA_BASE$PANDORA_TEMP
 		chmod 775 $PANDORA_BASE$PANDORA_TEMP
 	else
-		chown root:root $PANDORA_BASE$PANDORA_LOG_DIR/$PANDORA_LOG
+		chown $PANDORA_USER:root $PANDORA_BASE$PANDORA_LOG_DIR/$PANDORA_LOG
 	fi
 
     echo "Copying default agent configuration to $PANDORA_BASE$PANDORA_CFG/pandora_agent.conf"