diff --git a/scripts/firstrun b/scripts/firstrun
index eba6292f97..22afabfd36 100644
--- a/scripts/firstrun
+++ b/scripts/firstrun
@@ -34,8 +34,10 @@ cat > /tmp/create_swap.sh <<EOT
 setupcon --save
 # SSH Keys creation
 rm -f /etc/ssh/ssh_host*
+read entropy_before </proc/sys/kernel/random/entropy_avail
 dpkg-reconfigure openssh-server >/dev/null 2>&1
-echo -e "### [firstrun] Recreated SSH keys" >>${Log}
+read entropy_after </proc/sys/kernel/random/entropy_avail
+echo -e "### [firstrun] Recreated SSH keys (entropy: \${entropy_before} \${entropy_after})" >>${Log}
 MEMTOTAL=$(( $(awk -F" " '/^MemTotal/ {print $2}' </proc/meminfo) / 1024 ))
 FREESIZE=\$(df -hm / | awk '/\// {print \$(NF-2)}')
 SWAPFILE=/var/swap
@@ -116,11 +118,6 @@ adjust_sunxi_settings() {
 	
 	# trigger red or blue LED as user feedback
 	echo heartbeat >/sys/class/leds/*red*/trigger 2>/dev/null || echo heartbeat >/sys/class/leds/*blue*/trigger 2>/dev/null	
-	[ -f /etc/wicd/wired-settings.conf ] && \
-		read HOSTNAME </etc/hostname
-		sed -i "s/^dhcphostname =.*/dhcphostname = ${HOSTNAME}/" /etc/wicd/wired-settings.conf && \
-		sed -i "s/wpa_driver =.*/wpa_driver = none/" /etc/wicd/manager-settings.conf \
-		echo -e "\n### [firstrun] Use ${HOSTNAME} for wicd settings" >>${Log}
 } # adjust_sunxi_settings
 
 do_expand_rootfs() {
@@ -267,7 +264,8 @@ do_firstrun_automated_user_configuration()
 		#-----------------------------------------------------------------------------
 		# - Remove configuration file
 		if [[ $FR_general_delete_this_file_after_completion == 1 ]]; then
-			echo 0 > "$fp_config"
+			dd if=/dev/urandom of="$fp_config" bs=16K count=1
+			sync
 			rm "$fp_config"
 		fi
 
@@ -393,7 +391,7 @@ main() {
 		do_expand_rootfs
 	fi
 
-	do_firstrun_automated_user_configuration
+	do_firstrun_automated_user_configuration &
 
 	/tmp/create_swap.sh &