diff --git a/setup/preflight.sh b/setup/preflight.sh
index 6a3101d1..013eb038 100644
--- a/setup/preflight.sh
+++ b/setup/preflight.sh
@@ -18,7 +18,7 @@ if [ "$OS" != "Debian GNU/Linux 10 (buster)" -a "$OS" != "Ubuntu 20.04 LTS" ]; t
 	exit 1
 fi
 
-sed -i "s/__OSTAG__/$OS/g" management/templates/index.html
+sed -i "s|__OSTAG__|${OS}|g" management/templates/index.html
 
 # Check that we have enough memory.
 #
diff --git a/setup/questions.sh b/setup/questions.sh
index bd315fb5..0ed55154 100644
--- a/setup/questions.sh
+++ b/setup/questions.sh
@@ -21,7 +21,7 @@ if [ -z "${NONINTERACTIVE:-}" ]; then
 		"Hello and thanks for deploying a (Power) Mail-in-a-Box!
 		\n\nI'm going to ask you a few questions.
 		\n\nTo change your answers later, just run 'sudo mailinabox' from the command line.
-		\n\nNOTE: You should only install this on a brand new Debian installation 100% dedicated to Mail-in-a-Box. Mail-in-a-Box will, for example, remove apache2."
+		\n\nNOTE: You should only install this on a brand new Debian/Ubuntu installation 100% dedicated to Mail-in-a-Box. Mail-in-a-Box will, for example, remove apache2."
 fi
 
 # The box needs a name.