diff --git a/ecryptfs.sh b/ecryptfs.sh
index 977bd79..80cf60e 100644
--- a/ecryptfs.sh
+++ b/ecryptfs.sh
@@ -13,7 +13,7 @@ function insert_keypair() {
 	local DATASIG="$(/bin/sed '1p;d' "${HOME}/.ecryptfs/${2}.sig")"
 	local NAMESIG="$(/bin/sed '2p;d' "${HOME}/.ecryptfs/${2}.sig")"
 	local DPF="${2}-passphrase"
-	local NPF="${DPF}-fname"
+	local NPF="${2}-fname-passphrase"
 
 	insert_key "${1}/${DPF}" "${HOME}/.ecryptfs/wrapped-${DPF}" "${DATASIG}"
 	insert_key "${1}/${NPF}" "${HOME}/.ecryptfs/wrapped-${NPF}" "${NAMESIG}"
diff --git a/keymanagement.sh b/keymanagement.sh
index f40151c..04c1dd1 100644
--- a/keymanagement.sh
+++ b/keymanagement.sh
@@ -21,7 +21,7 @@ function ssh-add() {
 	local ident="${1}"
 	local ask_pass ident_file
 
-	if [ "${ident}" ]
+	if [[ "${ident}" ]]
 	then
 		ask_pass="${HOME}/.ssh/getcred_${ident}.sh"
 		ident_file="${HOME}/.ssh/ident-${ident}"
@@ -30,7 +30,7 @@ function ssh-add() {
 		ident_file="${HOME}/.ssh/ident"
 	fi
 
-	if [ '-' != "${ident:0:1}" ]
+	if [[ '-' != "${ident:0:1}" ]]
 	then
 		DISPLAY=:0.0 SSH_ASKPASS="${ask_pass}" \
 			${SSH_ADD} ${ident_file} 2>/dev/null </dev/null
@@ -45,11 +45,11 @@ function ssh-init-agent() {
 	local ECHO="/bin/echo"
 	local SSH_AGENT="/usr/bin/ssh-agent"
 
-	test -e "${SSH_AGENT_FILE}" && eval `${CAT} "${SSH_AGENT_FILE}"` >/dev/null
+	[[ -e "${SSH_AGENT_FILE}" ]] && eval `${CAT} "${SSH_AGENT_FILE}"` >/dev/null
 
-	if [ "x" != x${SSH_AGENT_PID} ]
+	if [[ "x" != x${SSH_AGENT_PID} ]]
 	then
-		if [ "ssh-agent" = "`${PS} -p ${SSH_AGENT_PID} -o comm=`" ]
+		if [[ "ssh-agent" = "`${PS} -p ${SSH_AGENT_PID} -o comm=`" ]]
 		then
 			return
 		fi
@@ -57,7 +57,7 @@ function ssh-init-agent() {
 
 	${ECHO} -n "start ssh-agent ... "
 	${SSH_AGENT} >"${SSH_AGENT_FILE}"
-	if [ 0 -eq $? ]
+	if [[ 0 -eq $? ]]
 	then
 		eval `${CAT} "${SSH_AGENT_FILE}"` >/dev/null
 		${ECHO} "OK"
@@ -89,13 +89,13 @@ function gpg-init-agent() {
 	GPG_AGENT_PID="$(${PS} -h -U ${USER} -o pid -o comm |\
 		${AWK} '/gpg-agent/{print $1}')"
 
-	if [ "${SOCK_OPEN_PID}" -a "${GPG_AGENT_PID}" = "${SOCK_OPEN_PID}" ]
+	if [[ "${SOCK_OPEN_PID}" && ${GPG_AGENT_PID} == ${SOCK_OPEN_PID} ]]
 	then
 		return
 	else
 		${ECHO} -n "start gpg-agent ... "
-		${GPG_AGENT} ${GPG_AGENT_ARGS}
-		if [ 0 -eq $? ]
+		eval ${GPG_AGENT} ${GPG_AGENT_ARGS}
+		if [[ 0 -eq $? ]]
 		then
 			${CAT} "${CREDDIR}/gpg.pw" | ${GPG_PRESET} --preset ${KEYGRIP}
 			${CAT} "${CREDDIR}/gpg.pw" | ${GPG_PRESET} --preset ${SUBKEYGRIP}