diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 15ee0b89..a9c213bb 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -193,7 +193,7 @@ create_generic_image() {
 	# The presence of this file indicates that the initial
 	# setup has not yet been completed
     touch $rootdir/home/$MY_USERNAME/.initial_setup
-
+    touch $rootdir/home/root/.bashrc
    
 	cat >> $rootdir/home/$MY_USERNAME/.bashrc <<EOF
 # initial setup of the system
@@ -205,7 +205,14 @@ if [ -f ~/.initial_setup ]; then
     echo 'your system will be insecure. Your password should be at least 10'
     echo 'characters long and contain letters and numbers. Do this now:'
     passwd
+    rm ~/.initial_setup
     sudo su
+fi
+EOF
+
+	cat >> $rootdir/home/root/.bashrc <<EOF
+# initial setup of the system
+if [ -f ~/.initial_setup ]; then
     freedombone menuconfig
     rm ~/.initial_setup
 fi