diff --git a/simpleadmin/console/menu/change_hostname.sh b/simpleadmin/console/menu/change_hostname.sh
index ede205f..30ec0af 100644
--- a/simpleadmin/console/menu/change_hostname.sh
+++ b/simpleadmin/console/menu/change_hostname.sh
@@ -35,17 +35,22 @@ echo "$new_hostname" > /etc/hostname
 sed -i "s/127.0.1.1.*$/127.0.1.1\t$new_hostname/g" /etc/hosts
 hostname "$new_hostname"
 
-# Create the hostname service with sleep
+# Create the hostname service
 cat > /lib/systemd/system/set-hostname.service << EOF
 [Unit]
 Description=Set system hostname
-After=network.target
+After=network.target network-online.target
+Wants=network-online.target
+After=multi-user.target
+After=systemd-user-sessions.service
 
 [Service]
 Type=oneshot
 ExecStartPre=/bin/sleep 30
 ExecStart=/bin/sh -c 'hostname \$(cat /etc/hostname)'
 RemainAfterExit=yes
+StartLimitIntervalSec=300
+StartLimitBurst=3
 
 [Install]
 WantedBy=multi-user.target