diff --git a/frontend/public/json/gwn-manager.json b/frontend/public/json/gwn-manager.json
index 1a78754de..83d86b9ba 100644
--- a/frontend/public/json/gwn-manager.json
+++ b/frontend/public/json/gwn-manager.json
@@ -31,5 +31,10 @@
     "username": null,
     "password": null
   },
-  "notes": []
+  "notes": [
+    {
+      "text": "Gentoo compiles packages from source. Initial setup may take time.",
+      "type": "warning"
+    }
+  ]
 }
diff --git a/install/gwn-manager-install.sh b/install/gwn-manager-install.sh
index 6e3bd6f73..72b5b7603 100644
--- a/install/gwn-manager-install.sh
+++ b/install/gwn-manager-install.sh
@@ -19,10 +19,10 @@ $STD apt install -y \
     fontconfig
 msg_ok "Installed Dependencies"
 
-msg_info "Setting up GWN Manager"
+msg_info "Setting up GWN Manager (Patience)"
 RELEASE=$(curl -s https://www.grandstream.com/support/tools#gwntools \
   | grep -oP 'https://firmware\.grandstream\.com/GWN_Manager-[^"]+-Ubuntu\.tar\.gz')
-download_with_progress "$RELEASE" "/tmp/gwnmanager.tar.gz"
+download_file "$RELEASE" "/tmp/gwnmanager.tar.gz"
 cd /tmp
 tar -xzf gwnmanager.tar.gz --strip-components=1
 $STD ./install
@@ -33,6 +33,7 @@ cat <<EOF >/etc/systemd/system/gwnmanager.service
 [Unit]
 Description=GWN Manager
 After=network.target
+Requires=network.target
 
 [Service]
 Type=simple
@@ -44,7 +45,7 @@ RestartSec=10
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable -q --now gwnmanager
+systemctl enable -q gwnmanager
 msg_ok "Created Service"
 
 motd_ssh