diff -Nur e-smith-base-5.8.0.old/createlinks e-smith-base-5.8.0/createlinks
--- e-smith-base-5.8.0.old/createlinks	2020-09-30 15:31:18.288000000 -0400
+++ e-smith-base-5.8.0/createlinks	2020-09-30 16:19:33.419000000 -0400
@@ -308,6 +308,7 @@
 templates2events("/etc/smartd.conf", $event);
 templates2events("/home/e-smith/ssl.pem/pem", $event);
 event_link("fix-startup", $event, "05");
+event_link("systemd-default", $event, "05");
 event_link("rotate_timestamped_logfiles", $event, "05");
 event_link("init-accounts", $event, "05");
 event_link("set-hostname", $event, "10");
@@ -320,7 +321,9 @@
 event_link("conf-modules", $event, "30");
 event_link("create-mnt-floppy", $event, "50");
 event_link("conf-routes", $event, "89");
-event_link("reset-unsavedflag", $event, "95")
+event_link("systemd-isolate", $event, "94");
+event_link("reset-unsavedflag", $event, "95");
 
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/network");
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/wan");
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dhcpd");
@@ -333,6 +335,7 @@
 
 templates2events("/etc/smartd.conf", $event);
 templates2events("/home/e-smith/ssl.pem/pem", $event);
+event_link("systemd-default", $event, "05");
 event_link("set-hostname", $event, "10");
 event_link("conf-modules", $event, "30");
 event_link("conf-startup", $event, "60");
@@ -349,6 +352,7 @@
 
 templates2events("/etc/smartd.conf", $event);
 templates2events("/home/e-smith/ssl.pem/pem", $event);
+event_link("systemd-default", $event, "05");
 event_link("rmmod-bonding", $event, "10");
 event_link("set-hostname", $event, "10");
 event_link("conf-modules", $event, "30");
@@ -363,6 +367,7 @@
 
 templates2events("/etc/nsswitch.conf", $event);
 templates2events("/etc/pam.d/system-auth", $event);
+event_link("systemd-default", $event, "05");
 event_link("user-lock-passwd", $event, "15");
 event_link("user-modify-unix", $event, "15");
 
@@ -396,6 +401,7 @@
 
 $event = "halt";
 
+event_link("systemd-default", $event, "05");
 event_link("halt", $event, "70");
 
 #--------------------------------------------------
@@ -430,6 +436,7 @@
 $event = "post-install";
 
 event_link("fix-startup", $event, "05");
+event_link("systemd-default", $event, "05");
 event_link("rotate_timestamped_logfiles", $event, "05");
 event_link("init-accounts", $event, "05");
 event_link("init-passwords", $event, "10");
@@ -444,6 +451,7 @@
 $event = "post-upgrade";
 
 event_link("fix-startup", $event, "05");
+event_link("systemd-default", $event, "05");
 event_link("rotate_timestamped_logfiles", $event, "05");
 event_link("init-accounts", $event, "05");
 event_link("conf-startup", $event, "10");
@@ -461,6 +469,7 @@
 
 $event = "reboot";
 
+event_link("systemd-default", $event, "05");
 safe_symlink("stop", "root/etc/e-smith/events/$event/services2adjust/wan");
 event_link("reboot", $event, "99");
 
@@ -632,11 +641,27 @@
 safe_touch("root/etc/e-smith/templates/etc/pam_ldap.secret/template-begin");
 
 
-system('mkdir -p root/usr/lib/systemd/system/multi-user.target.wants/');
-	unlink "root/usr/lib/systemd/system/multi-user.target.wants/bootstrap-console.service";
-symlink("/usr/lib/systemd/system/bootstrap-console.service",
-		"root/usr/lib/systemd/system/multi-user.target.wants/bootstrap-console.service")
-	or die "Can't symlink to root/usr/lib/systemd/system/multi-user.target.wants/bootstrap-console.service: $!";
+foreach my $target (qw(multi-user sme-server))
+{
+system('mkdir -p root/usr/lib/systemd/system/'.$target.'.target.wants/');
+        unlink "root/usr/lib/systemd/system/$target.target.wants/bootstrap-console.service";
+
+foreach my $unit (qw(bootstrap-console.service 
+	dbus.service 
+	getty.target 
+	plymouth-quit.service 
+	plymouth-quit-wait.service 
+	systemd-ask-password-wall.path 
+	systemd-logind.service
+	systemd-update-utmp-runlevel.service
+	systemd-user-sessions.service
+	))
+	{
+	symlink("../$unit",
+                "root/usr/lib/systemd/system/$target.target.wants/$unit")
+        or die "Can't symlink to root/usr/lib/systemd/system/$target.target.wants/$unit: $!";
+	}
+}
 
 # languages links
 foreach (qw(fr-be fr-lu fr-mc fr-ch))
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-default e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-default
--- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-default	1969-12-31 19:00:00.000000000 -0500
+++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-default	2020-09-30 16:14:10.291000000 -0400
@@ -0,0 +1,5 @@
+#!/usr/bin/bash
+/usr/bin/systemctl  enable sme-server.target
+/usr/bin/systemctl  set-default sme-server.target
+# /usr/bin/systemctl  disable multi-user.target
+
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-isolate e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-isolate
--- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-isolate	1969-12-31 19:00:00.000000000 -0500
+++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-isolate	2020-09-30 16:13:55.794000000 -0400
@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+/usr/bin/systemctl isolate sme-server.target
+/usr/bin/systemctl daemon-reload
diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system/sme-server.target e-smith-base-5.8.0/root/usr/lib/systemd/system/sme-server.target
--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system/sme-server.target	1969-12-31 19:00:00.000000000 -0500
+++ e-smith-base-5.8.0/root/usr/lib/systemd/system/sme-server.target	2020-09-30 15:33:14.457000000 -0400
@@ -0,0 +1,11 @@
+#  This file is part of Koozali SME Server.
+#
+
+[Unit]
+Description=Koozali SME Server System
+Documentation=man:systemd.special(7)
+Requires=basic.target 
+Conflicts=rescue.service rescue.target multi-user.target
+After=basic.target rescue.service rescue.target
+AllowIsolate=yes
+Wants=acpid.service atd.service auditd.service avahi-daemon.service brandbot.path crond.service irqbalance.service nfs-client.target remote-fs.target rhel-configure.service rsyslog.service smartd.service yum-cron.service
diff -Nur e-smith-base-5.8.0.old/root/sbin/e-smith/service e-smith-base-5.8.0/root/sbin/e-smith/service
--- e-smith-base-5.8.0.old/root/sbin/e-smith/service	2020-10-01 11:15:37.118000000 -0400
+++ e-smith-base-5.8.0/root/sbin/e-smith/service	2020-10-01 11:21:11.608000000 -0400
@@ -15,7 +15,7 @@
    exit
 fi
 
-if [ "$runlevel" = "multi-user.target" ]
+if [ "$runlevel" = "multi-user.target" ] || [ "$runlevel" = "sme-server.target" ]
 then
     if ls /etc/rc7.d/S??$1 >/dev/null 2>/dev/null
     then