diff --git a/sway/scripts/fzf-pass b/sway/scripts/fzf-pass
index a75a8e2..9e5ba3e 100755
--- a/sway/scripts/fzf-pass
+++ b/sway/scripts/fzf-pass
@@ -13,37 +13,32 @@ if [ -z "$PASSFILE" ]; then
 	exit 0
 fi
 
-PASSDATA="$(pass "$PASSFILE")"
-USRNAME="$(echo "$PASSDATA" | grep "username:" | cut -d' ' -f2-)"
-PASS="$(echo "$PASSDATA" | head -n 1)"
-URL="$(echo "$PASSDATA" | grep url: | cut -d' ' -f2-)"
-
 RESP=$(cat <<EOF | fzf
 Autotype
 Username
 Password
-URL
 Page
 EOF
 );
 
-swaymsg move container to workspace 9
-
 case "$RESP" in
 	Autotype)
-		ydotool type "$USRNAME" && ydotool key Tab && ydotool type "$PASS" && ydotool key Enter
+        swaymsg exec "source ~/.profile \
+            && ydotool type \"\$(pass get_user $PASSFILE)\" \
+            && ydotool key TAB \
+            && ydotool type \"\$(pass get_pass $PASSFILE)\""
 		;;
 	Username)
-		ydotool type "$USRNAME"
+        swaymsg exec "source ~/.profile \
+            && ydotool type \"\$(pass get_user $PASSFILE)\""
 		;;
 	Password)
-		ydotool type "$PASS"
-		;;
-	URL)
-		ydotool type "$URL"
+        swaymsg exec "source ~/.profile \
+            && ydotool type \"\$(pass get_pass $PASSFILE)\""
 		;;
 	Page)
-		 "$(dirname "$0")/tty-popup" info "bash -c 'echo ${PASSDATA} | LESS=R less'"
+        "$HOME/.config/sway/scripts/tty-popup" info \
+            bash -c "pass \"${PASSFILE}\" | LESS=R less" 
 		;;
 	*)
 		exit 1