diff --git a/board/common/rootfs/usr/bin/askline b/board/common/rootfs/usr/bin/askline
index 7420b0d74..ec27c6d94 100755
--- a/board/common/rootfs/usr/bin/askline
+++ b/board/common/rootfs/usr/bin/askline
@@ -1,10 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 # Prompt for a single-line value, prefilled with the current one.
 #
 #    askline LABEL FILE
 #
 # FILE holds the current value on entry and the new value on exit.
-# shellcheck disable=SC3045
 
 LABEL=$1
 FILE=$2
diff --git a/board/common/rootfs/usr/bin/askpass b/board/common/rootfs/usr/bin/askpass
index 7c47f1d21..562bad0a1 100755
--- a/board/common/rootfs/usr/bin/askpass
+++ b/board/common/rootfs/usr/bin/askpass
@@ -20,18 +20,18 @@ if [ "$1" = "-b" ]; then
 fi
 OUTPUT=$1
 
-read -r -s -p "$LABEL: " secret
+read -r -s -p "$LABEL: " secret || exit 1
 >&2 echo
-read -r -s -p "Retype $LABEL: " secret_again
+read -r -s -p "Retype $LABEL: " secret_again || exit 1
 >&2 echo
 
 if [ "$secret" != "$secret_again" ]; then
-    echo "${LABEL}s do not match, try again."
+    >&2 echo "${LABEL}s do not match, try again."
     exit 1
 fi
 
 if [ -z "$secret" ]; then
-    echo "Empty $LABEL, try again."
+    >&2 echo "Empty $LABEL, try again."
     exit 1
 fi