diff --git a/app/http/controllers/safe_controller.go b/app/http/controllers/safe_controller.go
index 65e9b160..0ea88eb8 100644
--- a/app/http/controllers/safe_controller.go
+++ b/app/http/controllers/safe_controller.go
@@ -39,14 +39,32 @@ func (r *SafeController) SetFirewallStatus(ctx http.Context) http.Response {
 	if ctx.Request().InputBool("status") {
 		if tools.IsRHEL() {
 			err = tools.ServiceStart("firewalld")
+			if err == nil {
+				err = tools.ServiceEnable("firewalld")
+			}
 		} else {
 			_, err = tools.Exec("echo y | ufw enable")
+			if err == nil {
+				err = tools.ServiceStart("ufw")
+			}
+			if err == nil {
+				err = tools.ServiceEnable("ufw")
+			}
 		}
 	} else {
 		if tools.IsRHEL() {
 			err = tools.ServiceStop("firewalld")
+			if err == nil {
+				err = tools.ServiceDisable("firewalld")
+			}
 		} else {
 			_, err = tools.Exec("ufw disable")
+			if err == nil {
+				err = tools.ServiceStop("ufw")
+			}
+			if err == nil {
+				err = tools.ServiceDisable("ufw")
+			}
 		}
 	}
 
diff --git a/scripts/install_panel.sh b/scripts/install_panel.sh
index 335842d1..9e06bd10 100644
--- a/scripts/install_panel.sh
+++ b/scripts/install_panel.sh
@@ -289,6 +289,8 @@ Init_Panel() {
     elif [ "${OS}" == "debian" ]; then
         apt-get install ufw -y
         echo y | ufw enable
+        systemctl enable ufw
+        systemctl start ufw
         ufw allow 22/tcp
         ufw allow 80/tcp
         ufw allow 443/tcp