diff --git a/scripts/wpass b/scripts/wpass
index 2b6240e..52bcdff 100755
--- a/scripts/wpass
+++ b/scripts/wpass
@@ -29,8 +29,8 @@ main() {
 
     test -n "$entry" || exit 0
 
-    username=`pass show "$entry" 2>/dev/null | rg -m1 '(login|user|email): (.*)' -r '$2'` || true
-    password=`pass show "$entry" 2>/dev/null | head -n 1` || true
+    username=`pass show "$entry" 2>/dev/null | rg -m1 '(login|user|email): (.*)' -r '$2'`
+    password=`pass show "$entry" 2>/dev/null | head -n 1`
     otp=`pass otp "$entry" 2>/dev/null` || true
 
     action="$(print_actions_for_entry | wdmenu -p Action)"
@@ -50,10 +50,8 @@ main() {
 }
 
 autotype(){
-    if test -n "$username"; then
-        env wtype -s 100 "$username"
-        env wtype -s 100 -k tab
-    fi
+    env wtype -s 100 "$username"
+    env wtype -s 100 -k tab
     env wtype -s 100 "$password"
 }