diff --git a/dobroho_vechora.bash b/dobroho_vechora.bash
index 5ad75c3..30d9faf 100755
--- a/dobroho_vechora.bash
+++ b/dobroho_vechora.bash
@@ -67,7 +67,7 @@ encrypt() {
 		cat
 		return 0
 	fi
-	echo "ENCRYPTED"'!'"<$(openssl enc -pbkdf2 -A -aes256 -pass env:DOBROHO_VECHORA_ENCRYPTION_PASSWORD)>"
+	echo "ENCRYPTED"'!'"<$(openssl enc -pbkdf2 -a -A -aes256 -pass env:DOBROHO_VECHORA_ENCRYPTION_PASSWORD)>"
 }
 
 decrypt() {
@@ -81,7 +81,7 @@ decrypt() {
 		cipher="$(echo "${i}" | grep -Po 'ENCRYPTED!<\K([a-zA-Z0-9\=\+\/]*)(?=\>)')" || :
 		if [ -n "${cipher}" ]; then
 			echo -n "Decrypted: "
-			echo "$(echo "${cipher}" | openssl enc -pbkdf2 -d -A -aes256 -pass env:DOBROHO_VECHORA_ENCRYPTION_PASSWORD || :)"
+			echo "$(echo "${cipher}" | openssl enc -pbkdf2 -d -a -A -aes256 -pass env:DOBROHO_VECHORA_ENCRYPTION_PASSWORD | tr -d '\n')"
 		fi
 	done
 }