diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index c19771a75f..4b0d920dc9 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-27  Junichi Satoh  <junichi@rworks.jp>
+
+	* unix/pandora_agent_installer: Set PANDORA_USER="root" when it is
+	not defined.
+
 2010-09-20  Ramon Novoa  <rnovoa@artica.es>
 
 	* unix/pandora_agent, win32/modules/pandora_module.cc: Added
diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index 9740d61179..554948df4c 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-27  Junichi Satoh  <junichi@rworks.jp>
+
+	* pandora_agent_installer: Set PANDORA_USER="root" when it is not
+	defined.
+
 2010-09-22  Sancho Lerena <slerena@artica.es>
 
 	* pandora_agent.spec: Updated RPM spec for SUSE
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 3542a49811..101a120cfa 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -200,6 +200,8 @@ install () {
 		mv pandora_agent_daemon.tmp pandora_agent_daemon
 		rm -f pandora_agent_daemon.tmp 2> /dev/null
 		chmod 755 pandora_agent_daemon
+	else
+		PANDORA_USER="root"
 	fi
 
 	# Create logfile
@@ -259,8 +261,8 @@ install () {
 	chmod 640 $PANDORA_BASE$PANDORA_LOG_DIR/$PANDORA_LOG
 	if [ "$OS_NAME" = "FreeBSD" ]
 	then
-	    chown root:wheel $PANDORA_BASE$PANDORA_LOG_DIR/$PANDORA_LOG	
-	    chown root:daemon $PANDORA_BASE$PANDORA_TEMP
+	    chown $PANDORA_USER:wheel $PANDORA_BASE$PANDORA_LOG_DIR/$PANDORA_LOG	
+	    chown $PANDORA_USER:daemon $PANDORA_BASE$PANDORA_TEMP
 	    chmod -R 770 $PANDORA_BASE$PANDORA_TEMP
 	    chmod 775 $PANDORA_BASE$PANDORA_TEMP
 	else