diff --git a/src/freedombone-image b/src/freedombone-image
index de9624653d133a7ac084c4283ac40f2596d6ba76..4874d0543d91ba057245aa0a1e9bd07c2c088059 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -138,9 +138,23 @@ make $IMAGE_TYPE \
     NAMESERVER1="$NAMESERVER1" \
     NAMESERVER2="$NAMESERVER2"
 
-mv build/*.bz2 $CURR_DIR
-mv build/*.img $CURR_DIR
-mv build/*.sig $CURR_DIR
+shopt -s nullglob
+imgfiles=(build/freedombone*.img)
+if [ ${#imgfiles[@]} -eq 0 ]; then
+	echo 'Image was not created'
+	rm -rf $BUILD_DIR
+	exit 1
+fi
+
+mv build/freedombone*.bz2 $CURR_DIR
+mv build/freedombone*.img $CURR_DIR
+mv build/freedombone*.sig $CURR_DIR
 rm -rf $BUILD_DIR
 
+clear
+echo '
+Image was created
+'
+ls -lh freedombone*.img freedombone*.sig freedombone*.bz2
+
 exit 0
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index ff379471d8b25ba022a6a0390ba3fc558f3ef1d3..797b80e209b10061d48c7b525270e70783b0be6d 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -18,7 +18,7 @@
 set -e
 set -x
 
-MY_USERNAME=$USER
+MY_USERNAME='debian'
 MY_PASSWORD='freedombone'
 
 # IP address of the router (gateway)
@@ -191,7 +191,7 @@ sed -i "/nameserver $NAMESERVER1/a\nameserver $NAMESERVER2" $rootdir/etc/resolv.
 echo "
 To complete the installation run the following:
 
-    su
+    sudo su
     freedombone menuconfig
 
 " > $rootdir/etc/init.d/motd