diff --git a/scripts/firstrun b/scripts/firstrun
index b323a22565..522f886132 100644
--- a/scripts/firstrun
+++ b/scripts/firstrun
@@ -96,6 +96,8 @@ collect_informations() {
 display_alert() {
 	if [ "${DISTRIBUTION}" == "wheezy" ]; then
 		echo -e "[\e[0;32m ok \x1B[0m] ${1}" > /dev/tty1
+	elif [ "${DISTRIBUTION}" == "jessie" ]; then
+		echo -e "[\e[0;32m  OK  \x1B[0m] ${1}" > /dev/tty1
 	else
 		echo -e " * ${1}" > /dev/tty1
 	fi
@@ -260,13 +262,13 @@ main() {
 	collect_informations
 
 	if [[ "$rootfstype" == "ext4" && ! -f "/root/.no_rootfs_resize" ]]; then
-		display_alert "Expand ext4 root filesystem"
+		display_alert "Resizing root filesystem."
 		do_expand_rootfs
 	fi
 
-	display_alert "Creating 128Mb emergency swap area"
-	display_alert "SSH keys recreation. One moment please"
-	display_alert "Updating packages"
+	display_alert "Starting 128Mb emergency swap area creation."
+	display_alert "Starting SSH keys recreation."
+
 	touch /tmp/firstrun_running
 	/tmp/create_swap.sh &