diff --git a/ansible/templates/usb/scripts/computenode.sh.j2 b/ansible/templates/usb/scripts/computenode.sh.j2
index 11e444d5..8ba784f5 100644
--- a/ansible/templates/usb/scripts/computenode.sh.j2
+++ b/ansible/templates/usb/scripts/computenode.sh.j2
@@ -42,6 +42,7 @@ function errexit() {
 
 function cr_once() {
 	if [[ -z "${did_cr_once}" ]]; then
+		printf '\033c' >&${CONSOLE_FD}
 		# This is to move us to the beginning of the line with the login: prompt
 		printf "\r" >&${CONSOLE_FD}
 		did_cr_once=1
diff --git a/ansible/templates/usb/scripts/headnode.sh.j2 b/ansible/templates/usb/scripts/headnode.sh.j2
index 5076b46a..082a502e 100644
--- a/ansible/templates/usb/scripts/headnode.sh.j2
+++ b/ansible/templates/usb/scripts/headnode.sh.j2
@@ -42,6 +42,7 @@ function errexit() {
 
 function cr_once() {
 	if [[ -z "${did_cr_once}" ]]; then
+		printf '\033c' >&${CONSOLE_FD}
 		# This is to move us to the beginning of the line with the login: prompt
 		printf "\r" >&${CONSOLE_FD}
 		did_cr_once=1
diff --git a/ansible/templates/usb/scripts/prompt-config.sh.j2 b/ansible/templates/usb/scripts/prompt-config.sh.j2
index 50f6894b..e6b55e0a 100644
--- a/ansible/templates/usb/scripts/prompt-config.sh.j2
+++ b/ansible/templates/usb/scripts/prompt-config.sh.j2
@@ -736,6 +736,7 @@ nicsup()
 		dladm create-vnic -l ${admin_iface} -v ${admin_vlan_id} ${admin_iface_active}
 		ifconfig ${admin_iface_active} plumb
 	else
+		ifconfig ${admin_iface} plumb 2> /dev/null
 		admin_iface_active="${admin_iface}"
 	fi
 
@@ -1751,9 +1752,7 @@ web management.\n\n"
 	message="
 Please choose a password that will protect your Danube Cloud data center
 configuration settings. This password will be required whenever you
-install an additional compute node into your data center.
-
-PLEASE KEEP THIS PASSWORD SAFE AND CONFIDENTIAL!\n\n"
+install an additional compute node into your data center.\n\n"
 {% else %}
 	message="
 Please enter the Configuration master password that was used during