diff --git a/debootstrap.sh b/debootstrap.sh
index 9fe1984adf..f8356ee7b1 100644
--- a/debootstrap.sh
+++ b/debootstrap.sh
@@ -120,6 +120,9 @@ cp $SRC/lib/bin/armbian.key $DEST/cache/sdcard
 chroot $DEST/cache/sdcard /bin/bash -c "cat armbian.key | apt-key add -"
 rm $DEST/cache/sdcard/armbian.key
 
+# display welcome message at first root login
+touch $DEST/cache/sdcard/root/.not_logged_in_yet
+
 # update and upgrade
 LC_ALL=C LANGUAGE=C LANG=C chroot $DEST/cache/sdcard /bin/bash -c "apt-get -y update" | dialog --progressbox "Updating package databases ..." 20 70
 
diff --git a/makeboarddeb.sh b/makeboarddeb.sh
index 5809ca1c80..59a1184962 100644
--- a/makeboarddeb.sh
+++ b/makeboarddeb.sh
@@ -87,8 +87,7 @@ create_board_package (){
 	# first login and reboot note when updated
 	mkdir -p $destination/root $destination/tmp $destination/etc/profile.d
 	install -m 755 $SRC/lib/scripts/check_first_login_reboot.sh 	$destination/etc/profile.d
-	install -m 755 $SRC/lib/scripts/check_first_login.sh 			$destination/etc/profile.d
-	touch $destination/root/.not_logged_in_yet
+	install -m 755 $SRC/lib/scripts/check_first_login.sh 			$destination/etc/profile.d	
 	touch $destination/tmp/.reboot_required
 
 	if [[ $LINUXCONFIG == *sun* ]] ; then