diff --git a/build/queued/afterinstall.sh b/build/queued/afterinstall.sh
index 7aabd4c..7bb14a5 100644
--- a/build/queued/afterinstall.sh
+++ b/build/queued/afterinstall.sh
@@ -25,10 +25,12 @@ if [ -f $SSLDIR/cracklord_ca_ssl.conf -a -f $SSLDIR/cracklord_queued_ssl.conf -a
 	fi
 
 	# Remove requests and config files
-	rm -r /etc/cracklord/ssl/*.csr
+	rm -r /etc/cracklord/ssl/*.csr >/dev/null 2>&1 || true
 fi 
 
 # Set to startup on boot
-systemctl enable cracklord-queued
+if [ ! -f /etc/systemd/system/cracklord-queued.service ]; then
+	systemctl enable cracklord-queued
+fi
 
 systemctl restart cracklord-queued
\ No newline at end of file
diff --git a/build/resourced/afterinstall.sh b/build/resourced/afterinstall.sh
index 3556005..beab6b0 100644
--- a/build/resourced/afterinstall.sh
+++ b/build/resourced/afterinstall.sh
@@ -19,6 +19,8 @@ if [ -d /var/log/cracklord ]; then
 	chown -R cracklord:cracklord /var/log/cracklord
 fi
 
-systemctl enable cracklord-resourced
+if [ ! -f /etc/systemd/system/cracklord-resourced.service ]; then
+	systemctl enable cracklord-resourced
+fi
 
 systemctl restart cracklord-resourced
\ No newline at end of file