diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 67e2bdec6..2d241d460 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -6233,7 +6233,7 @@ class SurveyAdminAjax {
 	}
 
 
-    // Alert na vsa vprašanja - popup
+    // Dodeljevanje uredniskega dostopa do ankete
 	private function ajax_add_survey_dostop_popup(){
 		global $lang, $pass_salt, $global_user_id, $site_path, $site_url, $admin_type;
 					
@@ -6407,10 +6407,9 @@ class SurveyAdminAjax {
         echo '<span class="buttonwrapper floatRight" title="'.$lang['srv_zapri'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="smtpAAIPopupClose(); return false;"><span>'.$lang['srv_zapri'].'</span></a></span>';
         echo '</div>';
     }
-}
 
-// Alert na vsa vprašanja - popup
-function ajax_alert_all_popup(){
+	// Alert na vsa vprašanja - popup
+	private function ajax_alert_all_popup(){
 	global $lang;
 				
 	$alert_type = $_POST['alert_type'];
@@ -6422,14 +6421,18 @@ function ajax_alert_all_popup(){
 	echo '<h2>'.$lang['srv_'.$alert_type.'_reminder_all'].'</h2>';
 	
 	echo '<div class="popup_content">';
-	echo $alert_type;
+	echo $lang['srv_reminder_popup_warning'];
 	echo '</div>';
 
 	echo '<div class="buttons_holder">';
-	echo '<span class="buttonwrapper floatRight" title="'.$lang['srv_zapri']
+	echo '<span class="buttonwrapper floatRight" style="margin:3px" title="'.$lang['srv_zapri']
 	.'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="AlertAllPopupClose(); return false;"><span>'
 	.$lang['srv_zapri'].'</span></a></span>';
+	echo '<span class="buttonwrapper floatRight" style="margin:3px" title="'.$lang['srv_tip_sample_t6_8_o2']
+	.'"><a class="ovalbutton ovalbutton_gray" href="ajax.php?a=reminder_all&what='.$alert_type.'&anketa='.$this->anketa.'" onclick="AlertAllPopupClose(); return false;"><span>'
+	.$lang['srv_tip_sample_t6_8_o2'].'</span></a></span>';
 	echo '</div>';
 }
+}
 
 ?>
\ No newline at end of file
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 941cd908f..9177d09ed 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -279,8 +279,8 @@ class SurveyAdminSettings {
 			
 			echo '<span class="nastavitveSpan3 bold">'.$lang['srv_opozorilo_vprasanja'].':</span>&nbsp;
 						<a href="#" onClick="popupAlertAll(\'soft\')">'.$lang['srv_soft_reminder_all'].'</a>,
-						<a href="ajax.php?a=reminder_all&what=hard&anketa='.$this->anketa.'">'.$lang['srv_hard_reminder_all'].'</a>,
-						<a href="ajax.php?a=reminder_all&what=no&anketa='.$this->anketa.'">'.$lang['srv_no_reminder_all'].'</a>';
+						<a hhref="#" onClick="popupAlertAll(\'hard\')">'.$lang['srv_hard_reminder_all'].'</a>,
+						<a hhref="#" onClick="popupAlertAll(\'no\')">'.$lang['srv_no_reminder_all'].'</a>';
  			
 			echo '<br /><br />';
 			
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index ac7244a10..596c5d2e1 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5521,7 +5521,7 @@ function popupAlertAll(alert_type){
 
     $('#fade').fadeTo('slow', 1);
     $('#popup_note').html('').fadeIn('slow');
-    $("#popup_note").load('ajax.php?a=alert_all_popup', {alert_type, anketa:srv_meta_anketa_id});
+    $("#popup_note").load('ajax.php?a=alert_all_popup', {alert_type:alert_type, anketa:srv_meta_anketa_id});
 }
 
 function AlertAllPopupClose(){   
diff --git a/lang/1.php b/lang/1.php
index 85f7f80ff..e779709c1 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5786,6 +5786,7 @@ $lang = array (
 	"srv_hard_reminder_all"						=>	"Nastavi trdo opozorilo na vsa vprašanja",
 	"srv_soft_reminder_all"						=>	"Nastavi mehko opozorilo na vsa vprašanja",
 	"srv_no_reminder_all"						=>	"Odstrani opozorila iz vseh vprašanj",
+	"srv_reminder_popup_warning"				=>	"Ta funkcionalnost se zelo dolgo izvaja. Želite nadaljevati?",
 	"srv_jump_to"								=>	"Skoči na",
 	"srv_recode_h_variable"						=>	"Variable",
 	"srv_recode_h_actions"						=>	"Funkcije rekodiranja",
diff --git a/lang/2.php b/lang/2.php
index 924808cdc..8c5368bc9 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -5683,6 +5683,7 @@ $lang = array (
 	"srv_hard_reminder_all"						=>	"Set hard reminder to all questions",
 	"srv_soft_reminder_all"						=>	"Set soft reminder to all questions",
 	"srv_no_reminder_all"						=>	"Remove reminders from all questions",
+	"srv_reminder_popup_warning"				=>	"This functionality takes a long time to complete. Do you wish to proceed?",
 	"srv_jump_to"								=>	"Jump to",
 	"srv_recode_h_variable"						=>	"Variables",
 	"srv_recode_h_actions"						=>	"Recode functions",