diff --git a/conf/wireguard_ui.service b/conf/wireguard_ui.service
index eb79f7a..af3a207 100644
--- a/conf/wireguard_ui.service
+++ b/conf/wireguard_ui.service
@@ -7,7 +7,7 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__FINALPATH__/
-ExecStart=__FINALPATH__/wireguard-ui --bind-address="127.0.0.1:__PORT__" --disable-login >> /var/log/__APP__/ui.log 2>&1
+ExecStart=__FINALPATH__/wireguard-ui --bind-address="127.0.0.1:__PORT__" --disable-login
 
 [Install]
 WantedBy=multi-user.target
diff --git a/scripts/install b/scripts/install
index cc65b6f..4a90331 100644
--- a/scripts/install
+++ b/scripts/install
@@ -173,7 +173,7 @@ chown -R $app:$app /etc/wireguard
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add wg-quick@wg0 --description "WireGuard" --needs_exposed_ports $port_wg
+yunohost service add wg-quick@wg0 --description "WireGuard" --needs_exposed_ports $port_wg --test_status "wg show | grep wg0"
 yunohost service add wireguard_ui --description "WireGuard UI"
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index e5fdbef..970b614 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -121,8 +121,8 @@ systemctl enable --quiet wireguard_ui_conf.path
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add wg-quick@wg0 --description "WireGuard" --needs_exposed_ports "$port_wg"
-yunohost service add wireguard_ui --description "WireGuard UI" --log "/var/log/$app/ui.log"
+yunohost service add wg-quick@wg0 --description "WireGuard" --needs_exposed_ports "$port_wg" --test_status "wg show | grep wg0"
+yunohost service add wireguard_ui --description "WireGuard UI"
 
 #=================================================
 # RESTORE VARIOUS FILES
diff --git a/scripts/upgrade b/scripts/upgrade
index e9b37ce..3d6a417 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -206,7 +206,7 @@ chmod -R 750 $final_path/db
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add wg-quick@wg0 --description "WireGuard" --needs_exposed_ports "$port_wg"
+yunohost service add wg-quick@wg0 --description "WireGuard" --needs_exposed_ports "$port_wg" --test_status "wg show | grep wg0"
 yunohost service add wireguard_ui --description "WireGuard UI"
 
 #=================================================