diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index df7fd2404..62e05ddfe 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -1131,8 +1131,6 @@ class SurveyAdminAjax {
 				'continue_later',
 				'js_tracking',
 				'defValidProfile',
-				'showItime',
-				'showLineNumber',
 				'parapodatki'
 				);
 				
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 90e649de8..3f556fbc4 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -652,7 +652,7 @@ class SurveyAdminSettings {
 			echo '</div>';
 
             // Pri volitvah ne moremo prikazati datuma respondenta
-            if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
+            /*if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
 
 				echo '<div class="setting_holder">';
                 echo '<span class="setting_title" >'.$lang['srv_prikaz_showItime'].'</span>';
@@ -681,7 +681,7 @@ class SurveyAdminSettings {
 			echo '<label for="showLineNumber1">'.$lang['yes'].'</label>';
 			echo '</div>';
 			
-			echo '</div>';
+			echo '</div>';*/
 
 			echo '</fieldset>';
 
diff --git a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
index 48d1a1d19..34132d1a3 100644
--- a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
+++ b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php
@@ -178,8 +178,7 @@ class SurveyDataDisplay{
         }
 
 		# ali prikazujemo datum na začetku ankete (Če smo v identifikatorjih ne smemo zaradi povezovanja)
-		if ( (self::$_VARS[VAR_SHOW_DATE] == true || (int)SurveyInfo :: getInstance()->getSurveyColumn('showItime') == 1) && self::$_VARS[VAR_SHOW_SYSTEM] == false ) {
-		//if (self::$_VARS[VAR_SHOW_DATE] == true && self::$_VARS[VAR_SHOW_SYSTEM] == false) {
+		if ( self::$_VARS[VAR_SHOW_DATE] == true && self::$_VARS[VAR_SHOW_SYSTEM] == false ) {
 			self::$showItime = true;
 		} 
 		else {
@@ -187,8 +186,7 @@ class SurveyDataDisplay{
 		}
 		
 		# ali prikazujemo zaporedno številko. (Če smo v identifikatorjih ne smemo zaradi povezovanja)
-		if ( (self::$_VARS[VAR_SHOW_NO] == true || (int)SurveyInfo :: getInstance()->getSurveyColumn('showLineNumber') == 1) && self::$_VARS[VAR_SHOW_SYSTEM] == false ) {
-		//if (self::$_VARS[VAR_SHOW_NO] == true) {
+		if ( self::$_VARS[VAR_SHOW_NO] == true && self::$_VARS[VAR_SHOW_SYSTEM] == false ) {
 			self::$showLineNumber = true;
 		} 
 		else {