diff --git a/pwd.sh b/pwd.sh
index 72f6aae..20588b5 100755
--- a/pwd.sh
+++ b/pwd.sh
@@ -74,7 +74,7 @@ read_pass () {
   fi
 
   if [[ -z "${2+x}" ]] ; then
-    read -p "
+    read -r -p "
   Username to read? (default: all) " username
   else
     username="${2}"
@@ -87,7 +87,7 @@ read_pass () {
   get_pass "
   Enter password to unlock ${safe}: "
   printf "\n\n"
-  decrypt ${password} ${safe} | grep " ${username}" || fail "Decryption failed"
+  decrypt ${password} ${safe} | grep -F " ${username}" || fail "Decryption failed"
 }
 
 
@@ -146,7 +146,7 @@ create_username () {
   # Create username with password.
 
   if [[ -z "${2+x}" ]] ; then
-    read -p "
+    read -r -p "
   Username: " username
   else
     username="${2}"