diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 98e3ffa..721cd1a 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -57,9 +57,9 @@ EOF
 	#cat $GNUPGHOME/openpgp-revocs.d/*.rev
 	cat /root/.gnupg/openpgp-revocs.d/*.rev | sed -e "/^pub/,+2 { s/.*/$(tput sgr0)$(tput bold)&$(tput sgr0)$(tput setaf 7)/; }"
 	tput setaf 3
-	gpg --armor --export | tee "$PGP_PUB_FILE"
+	gpg --armor --export --passphrase "$PASSWORD" | tee "$PGP_PUB_FILE"
 	tput setaf 4
-	gpg --armor --export-secret-keys | tee "$PGP_SEC_FILE"
+	gpg --armor --export-secret-keys --passphrase "$PASSWORD" | tee "$PGP_SEC_FILE"
 	tput sgr0
 
 	pkill gpg-agent 2>/dev/null
@@ -102,7 +102,7 @@ fi
 
 ## Password notice
 echo "$PASSWORD" | grep -q "/" && \
-	( echo -e "\n$(tput bold)WARN:$(tput sgr0)Please, write your 'passphrase=$PASSWORD' to $DM_CONF_FILE manually.\n" | grep --color=auto "/")
+	( echo -n -e "\n$(tput bold)WARN:$(tput sgr0)Please, write your 'passphrase=$PASSWORD'" | grep --color=auto -z -E "/" ; echo -n -e " to $DM_CONF_FILE manually.\n" )
 ## API credentials notice
 test -z "$CLIENT_ID" -o -z "$CLIENT_SECRET" && \
 	echo -e "NOTE:Please visit a BitDeals site to get your API credentials: $(tput smul)\$CLIENT_ID$(tput rmul) and $(tput smul)\$CLIENT_SECRET$(tput rmul).\n"