diff --git a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
index c60f91e8d..ec1a226b7 100644
--- a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
+++ b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
@@ -10485,8 +10485,8 @@ class SurveyInvitationsNew {
 		echo $lang['srv_email_setting_btn_save'] . '</a></div></span>';
 		
 		// Gumb preveri nastavitve
-		echo '<span id="send_mail_mode_test"  class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_green" href="#" onclick="showTestSurveySMTP(); return false;">';
-		echo $lang['srv_email_setting_btn_test'].'</a></div></span>';
+        echo '<span id="send_mail_mode_test" class="floatRight spaceRight '.($squalo->getSqualoActive() ? ' displayNone' : '').'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_green" href="#" onclick="showTestSurveySMTP(); return false;">';
+        echo $lang['srv_email_setting_btn_test'].'</a></div></span>';
 		
 		
 		if ($_GET['s'] == '1') {
diff --git a/admin/survey/script/invitations.js b/admin/survey/script/invitations.js
index ec31e91fc..439422422 100644
--- a/admin/survey/script/invitations.js
+++ b/admin/survey/script/invitations.js
@@ -1751,12 +1751,12 @@ function smtpAAIAccept(){
 function squaloSwitch(){
 
     if($('#squalo_mode').prop('checked')){
-        $('#send_mail_mode0, #send_mail_mode1, #send_mail_mode2, .mail_mode_switch').hide();
+        $('#send_mail_mode0, #send_mail_mode1, #send_mail_mode2, .mail_mode_switch, #send_mail_mode_test').hide();
         //$('.squalo_settings').show();
     }
     else{
         $('.squalo_settings').hide();
-        $('#send_mail_mode2, .mail_mode_switch').show();
+        $('#send_mail_mode2, .mail_mode_switch, #send_mail_mode_test').show();
     }
 }