diff --git a/layouts/v7/modules/Vtiger/resources/Vtiger.js b/layouts/v7/modules/Vtiger/resources/Vtiger.js
index 3d13692268e5d2c9990f9cc479101d5a5c4f96ce..a76cafe8a8272ece9acd056db4fffbae3670daca 100644
--- a/layouts/v7/modules/Vtiger/resources/Vtiger.js
+++ b/layouts/v7/modules/Vtiger/resources/Vtiger.js
@@ -126,6 +126,7 @@ Vtiger.Class('Vtiger_Index_Js', {
 				});
 			} else {
 				app.helper.showAlertBox({'message':app.vtranslate('JS_EMAIL_SERVER_CONFIGURATION')});
+				app.helper.hideProgress();
 			}
 		});
 	},
diff --git a/layouts/v7/resources/helper.js b/layouts/v7/resources/helper.js
index dacbf16fba5f5a5dfd9441c2f166ea31aa6f7076..d346aab70b152bd9b3c3e0d25798e2f14cc8e78b 100644
--- a/layouts/v7/resources/helper.js
+++ b/layouts/v7/resources/helper.js
@@ -167,7 +167,7 @@ jQuery.Class("Vtiger_Helper_Js",{
 		app.request.post({data:actionParams}).then(
 			function(err,data) {
 				var state = false;
-				if(err === null){
+				if(err === null && data==true){
 					state = true;
 				} else {
 					state = false;