diff --git a/app/funct.py b/app/funct.py
index f5b673b5..0e5f7663 100644
--- a/app/funct.py
+++ b/app/funct.py
@@ -715,7 +715,7 @@ def upload_and_restart(serv, cfg, **kwargs):
 			commands = ["sudo mv -f " + tmp_file + " " + config_path + " && sudo nginx -t -q && sudo systemctl reload nginx"]
 		else:
 			commands = ["sudo mv -f " + tmp_file + " " + config_path + " && sudo nginx -t -q && sudo systemctl restart nginx"]
-		if sql.get_setting('firewall_enable') == "1":
+		if sql.return_firewall(serv):
 			commands[0] += open_port_firewalld(cfg, serv=serv, service='nginx')
 	else:
 		haproxy_enterprise = sql.get_setting('haproxy_enterprise')
@@ -984,6 +984,8 @@ def ssh_command(serv, commands, **kwargs):
 			return stdout.read().decode(encoding='UTF-8')
 		elif kwargs.get('return_err') == 1:
 			return stderr.read().decode(encoding='UTF-8')
+		elif kwargs.get('raw'):
+			return stdout
 		else:
 			return stdout.read().decode(encoding='UTF-8')
 			
diff --git a/app/sql.py b/app/sql.py
index f8ed0165..eeb7c0d1 100644
--- a/app/sql.py
+++ b/app/sql.py
@@ -2321,7 +2321,7 @@ def return_firewall(serv):
 
 	cur.close()
 	con.close()
-	return True if firewall == '1' else False
+	return True if firewall == 1 else False
 
 
 form = funct.form
diff --git a/app/templates/hapservers.html b/app/templates/hapservers.html
index 96b413bf..97652879 100644
--- a/app/templates/hapservers.html
+++ b/app/templates/hapservers.html
@@ -146,7 +146,7 @@
 						{% else %}
 						src="/inc/images/shield-red.png" title="Auto start enabled, but keep alive service does not work"
 						{% endif %}
-						width=18 style="padding-left: 5px; margin-bottom: -3px;" />
+						width=18 style="margin-bottom: -3px;" />
 				{% endif %}
 				{% if role <= 2 %}
 				<span class="server-action">