diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 10e66a590..4fc36878a 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -8623,17 +8623,17 @@ class SurveyAdminSettings {
 		
 		echo '<fieldset>';
 		echo '<legend>'.$lang['srv_activate_duration_2'].' '.Help::display('srv_activity_quotas').'</legend>';
-		echo '<div class="setting_holder">';
+		echo '<div class="setting_holder" id="start">';
 		echo '<span class="setting_title">' . $lang['srv_activate_duration_manual_from'].'</span>';
 		echo '<div class="icon_holder">';
 		echo '<input id="startsManual1" type="text" class="large" readonly="true" name="durationStarts" value="' . $starts . '" autocomplete="off"/>';
 		echo '</div>';
 		echo '</div>';
 		
-		echo '<div class="setting_holder">';
+		echo '<div class="setting_holder" id="expire">';
 		echo '<span class="setting_title">' . $lang['srv_activate_duration_manual_to'].'</span>';
 		echo '<div class="icon_holder">';
-		echo '<input id="expireManual1" type="text" class="large" readonly="true" name="durationExpire" value="' . $expire . '" autocomplete="off"/>';
+		echo '<input id="expireManual1" type="text" class="large '.($row['expire'] == PERMANENT_DATE ? ' disabled' : '').'" readonly="true" name="durationExpire" value="' . $expire . '" autocomplete="off"/>';
 		echo '</div>';
 		echo '</div>';
 		
@@ -8648,8 +8648,12 @@ class SurveyAdminSettings {
 				<script type="text/javascript">
 				$(document).ready(function () {
                     datepicker("#startsManual1");
-                    datepicker("#expireManual1");
-				});
+                    datepicker("#expireManual1");';
+					
+		if($row['expire'] == PERMANENT_DATE)
+			echo '$("#expire").find(".ui-datepicker-trigger").addClass("displayNone");';
+
+		echo '		});
 			</script>';
 
 	}
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index db27f0553..997936b57 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -4422,12 +4422,13 @@ function setExpirePermanent() {
 		if (data.permanent == '0') {
 			// enablamo polje
 			$("#expireManual1").removeClass("disabled");
-			$(".ui-datepicker-trigger").removeClass("displayNone");
+			$("#expire").find(".ui-datepicker-trigger").removeClass("displayNone");
 
 		} else {
 			// disablamo polje
 			$("#expireManual1").addClass("disabled");
-			$(".ui-datepicker-trigger").addClass("displayNone");
+			$("#expire").find(".ui-datepicker-trigger").addClass("displayNone");
+
 		}
 		$("#expireManual1").val(data.expire);
 	});