diff --git a/debi.sh b/debi.sh
index 90f9aed..be977bd 100755
--- a/debi.sh
+++ b/debi.sh
@@ -44,12 +44,14 @@ prompt_password() {
         prompt="Choose a password for user $username: "
     fi
     stty -echo
+    trap 'stty echo' EXIT
     while [ -z "$password" ]; do
         echo -n "$prompt" > /dev/tty
         read -r password < /dev/tty
         echo > /dev/tty
     done
     stty echo
+    trap - EXIT
 }
 
 ip=