diff --git a/builds/install/misc/changeRunUser.sh.in b/builds/install/misc/changeRunUser.sh.in
index 7ddd7cf5cd..2270628545 100644
--- a/builds/install/misc/changeRunUser.sh.in
+++ b/builds/install/misc/changeRunUser.sh.in
@@ -26,7 +26,7 @@ fi
 # Update the /etc/inetd.conf or xinetd entry or /etc/init.d/firebird
 echo "Updating /etc file(s)"
 updateInetdServiceEntry
-changeInitRunUser
+changeInitRunUser $RunUser
 
 # Update ownership and SUID bits for programs.
 echo "Updating $FBRootDir"
diff --git a/builds/install/misc/posixLibrary.sh.in b/builds/install/misc/posixLibrary.sh.in
index f31d851fa0..11241aaa11 100644
--- a/builds/install/misc/posixLibrary.sh.in
+++ b/builds/install/misc/posixLibrary.sh.in
@@ -22,7 +22,7 @@ export ArchiveMainFile
 # Create temporary file. In case mktemp failed, do something...
 
 MakeTemp() {
-	TmpFile=`mktemp /tmp/firebird_install.XXXXXX`
+	TmpFile=`mktemp -q /tmp/firebird_install.XXXXXX`
 	if [ $? -ne 0 ]
 	then
 		TmpFile=/tmp/firebird_install
@@ -312,7 +312,7 @@ editFile() {
     Starting=$2
     NewLine=$3
 	
-	AwkProgram="(\$1 == \"$Starting\") {\$0=\"$NewLine\"} {print \$0}"
+	AwkProgram="(/^$Starting.*/ || \$1 == \"$Starting\") {\$0=\"$NewLine\"} {print \$0}"
 	MakeTemp
 	awk "$AwkProgram" <$FileName >$TmpFile && mv $TmpFile $FileName || rm -f $TmpFile
 }