diff --git a/app/static/js/install.js b/app/static/js/install.js
index 5ed2ba9d..9503e3f0 100644
--- a/app/static/js/install.js
+++ b/app/static/js/install.js
@@ -293,18 +293,24 @@ function showErrorStatus(service_name, server) {
 }
 function parseAnsibleJsonOutput(output, service_name, select_id) {
 	output = JSON.parse(JSON.stringify(output));
-	var check_apache_log = $('#translate').attr('data-check_apache_log');
-	var was_installed = $('#translate').attr('data-was_installed');
+	let was_installed = $('#translate').attr('data-was_installed');
+	let server_name = '';
 	for (var k in output['ok']) {
-		var server_name = $(select_id + ' option[value="'+k+'"]').text();
+		if (select_id) {
+			server_name = $(select_id + ' option[value="'+k+'"]').text();
+		}
 		toastr.success(service_name + ' ' + was_installed +' ' + server_name);
 	}
 	for (var k in output['failures']) {
-		var server_name = $(select_id + ' option[value="'+k+'"]').text();
+		if (select_id) {
+			server_name = $(select_id + ' option[value="'+k+'"]').text();
+		}
 		showErrorStatus(service_name, server_name);
 	}
 	for (var k in output['dark']) {
-		var server_name = $(select_id + ' option[value="'+k+'"]').text();
+		if (select_id) {
+			server_name = $(select_id + ' option[value="'+k+'"]').text();
+		}
 		showErrorStatus(service_name, server_name);
 	}
 }
diff --git a/inc/waf.js b/app/static/js/waf.js
similarity index 95%
rename from inc/waf.js
rename to app/static/js/waf.js
index 7b825994..0cbd46c0 100644
--- a/inc/waf.js
+++ b/app/static/js/waf.js
@@ -1,5 +1,5 @@
 var awesome = "/inc/fontawesome.min.js"
-var waf = "/inc/waf.js"
+var waf = "/static/js/waf.js"
 var overview = "/inc/overview.js"
 function showOverviewWaf(serv, hostnamea) {
 	var service = cur_url[1];
@@ -23,7 +23,7 @@ function showOverviewWafCallBack(serv, hostnamea) {
 		// },
 		// type: "POST",
 		beforeSend: function () {
-			$("#" + hostnamea).html('<img class="loading_small" src="/app/static/images/loading.gif" />');
+			$("#" + hostnamea).html('<img class="loading_small" src="/static/images/loading.gif" />');
 		},
 		success: function (data) {
 			$("#" + hostnamea).empty();
@@ -72,9 +72,9 @@ function installWaf(ip1) {
 			} else if (data.indexOf('Info') != '-1') {
 				toastr.clear();
 				toastr.info(data);
-			} else if (data.indexOf('success') != '-1') {
+			} else {
 				toastr.clear();
-				toastr.success('WAF service has been installed');
+				parseAnsibleJsonOutput(data, `${service} WAF`, false);
 				showOverviewWaf(ip, hostnamea);
 				$("#ajax").html('');
 			}
diff --git a/app/templates/waf.html b/app/templates/waf.html
index 99244a34..cb9fada9 100644
--- a/app/templates/waf.html
+++ b/app/templates/waf.html
@@ -2,7 +2,7 @@
 {% block title %}{{title}}{% endblock %}
 {% block h2 %}{{title}}{% endblock %}
 {% block content %}
-<script src="/inc/waf.js"></script>
+<script src="/app/static/js/waf.js"></script>
 {% if manage_rules == '1' %}
 	{% from 'include/input_macros.html' import input, checkbox %}
 	<table class="overview" id="waf_rules">