diff --git a/conf/init_ynh-hotspot b/conf/init_ynh-hotspot
index 0c7402b..6e9eb78 100644
--- a/conf/init_ynh-hotspot
+++ b/conf/init_ynh-hotspot
@@ -174,7 +174,6 @@ unset_ip6addr() {
 
 unset_dhcpd() {
   rm -f /etc/dnsmasq.d/dhcpdv?.conf
-  service dnsmasq restart
 }
 
 unset_forwarding() {
@@ -344,6 +343,7 @@ case "$1" in
         set_dhcpd
       fi
 
+      # Restart dhcpd
       service bind9 stop &> /dev/null
       service dnsmasq restart
 
@@ -388,6 +388,8 @@ case "$1" in
     if has_vpnclient_app; then
       service ynh-vpnclient start
     fi
+
+    service dnsmasq restart
   ;;
   restart)
     $0 stop
diff --git a/sources/views/settings.html.php b/sources/views/settings.html.php
index 2c6c2ce..71812b0 100644
--- a/sources/views/settings.html.php
+++ b/sources/views/settings.html.php
@@ -71,7 +71,7 @@
         <div style="padding: 14px 14px 0 10px">
           <div class="form-group">
             <label for="wifi_secure" class="col-sm-3 control-label"><?= T_('Hotspot Enabled') ?></label>
-            <div class="col-sm-9 input-group-btn" data-toggle="tooltip" ?>">
+            <div class="col-sm-9 input-group-btn">
               <div class="input-group">
                 <input type="checkbox" class="form-control switch" name="service_enabled" id="service_enabled" value="1" <?= $service_enabled == 1 ? 'checked="checked"' : '' ?> />
               </div>