diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 86cccf29d..5a703f0f3 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -101,36 +101,21 @@ class SurveyAdminSettings {
 			echo '<fieldset>';
 			echo '<legend>' . $lang['srv_osnovniPodatki'] . '</legend>';
 
-			echo '<div class="setting_holder">';
-			echo '<label for="anketa_polnoIme">'.$lang['srv_novaanketa_polnoime'].' - manjka form tag:</label>';
-			echo '<form>';
-			echo '<input type="text" class="large" id="anketa_polnoIme" name="anketa_polnoIme" value="' . $row['naslov'] . '" onblur="edit_anketa_naslov(\'' . $row['id'] . '\');"  maxlength="'.ANKETA_NASLOV_MAXLENGTH.'" />';
-			echo '</form>';
-			echo '<span class="charalimit" id="anketa_polnoIme_chars">' . strlen($row['naslov']) . '/'.ANKETA_NASLOV_MAXLENGTH.'</span>';
-			echo '</div>';
-
-			//copy za test <form> (se naj potem izbriše)
 			echo '<div class="setting_holder">';
 			echo '<label for="anketa_polnoIme">'.$lang['srv_novaanketa_polnoime'].':</label>';
-			echo '<form>';
 			echo '<input type="text" class="large" id="anketa_polnoIme" name="anketa_polnoIme" value="' . $row['naslov'] . '" onblur="edit_anketa_naslov(\'' . $row['id'] . '\');"  maxlength="'.ANKETA_NASLOV_MAXLENGTH.'" />';
-			echo '</form>';
 			echo '<span class="charalimit" id="anketa_polnoIme_chars">' . strlen($row['naslov']) . '/'.ANKETA_NASLOV_MAXLENGTH.'</span>';
 			echo '</div>';
 
 			echo '<div class="setting_holder">';
 			echo '<label for="anketa_akronim">'.$lang['srv_novaanketa_kratkoime'].':</label>';
-			echo '<form>';
 			echo '<input type="text" class="large" id="anketa_akronim" name="anketa_akronim" value="' . $row['akronim'] . '" onblur="edit_anketa_akronim(\'' . $row['id'] . '\');"  maxlength="'.ANKETA_AKRONIM_MAXLENGTH.'" />';
-			echo '</form>';
 			echo '<span class="charalimit" id="anketa_akronim_chars">' . strlen($row['akronim']) . '/'.ANKETA_AKRONIM_MAXLENGTH.'</span>';
 			echo '</div>';
 
 			echo '<div class="setting_holder">';
 			echo '<label for="anketa_note">'.$lang['srv_note'].':</label>';
-			echo '<form>';
 			echo '<textarea id="anketa_note" name="anketa_note" onblur="edit_anketa_note(\'' . $row['id'] . '\');" maxlength="'.ANKETA_NOTE_MAXLENGTH.'">' . $row['intro_opomba'] . '</textarea>';
-			echo '</form>';
 			echo '<span class="charalimit" id="anketa_note_chars">' . strlen($row['intro_opomba']) . '/'.ANKETA_NOTE_MAXLENGTH.'</span>';
 			echo '</div>';
 
@@ -150,7 +135,6 @@ class SurveyAdminSettings {
 
 				echo '<div class="setting_holder">';
 				echo '<label for="anketa_folder">'. $lang['srv_newSurvey_survey_new_folder'] .':</label>';
-				echo '<form>';
 				echo '<select class="dropdown large" name="anketa_folder" id="anketa_folder">';
 				echo '<option value="0" '.($selected_folder == 0 ? ' selected="selected"' : '').'>'.$lang['srv_newSurvey_survey_new_folder_def'].'</option>';
 				while($rowF = mysqli_fetch_array($sqlF)){
@@ -158,7 +142,6 @@ class SurveyAdminSettings {
 				}
 				echo '</select>';
 
-				echo '</form>';
 				echo '</div>';
 			}
 			
@@ -211,7 +194,6 @@ class SurveyAdminSettings {
 			echo '<div class="setting_holder">';
 			echo '<label for="lang_resp">'.$lang['srv_language_respons_1'].':</label>';
 
-			echo '<form>';
 			
 			asort($lang_array);
 			echo '<select class="dropdown large" id="lang_resp" name="lang_resp">';
@@ -220,7 +202,6 @@ class SurveyAdminSettings {
 			}
 			echo '</select>';
 
-			echo '</form>';			
 			echo '</div>';
             
             // Ta del se v 2. fazi zamenja z gumbom "Večjezične ankete"
@@ -627,10 +608,7 @@ class SurveyAdminSettings {
 			if ($admin_type == 0 || $admin_type == 1) {
 				echo '<fieldset><legend>'.$lang['srv_js_tracking'].'</legend>';
 				echo '<div class="setting_holder">';
-				echo '<form>';
 				echo '<textarea name="js_tracking">'.$row['js_tracking'].'</textarea>';
-				echo '</form>';
-
 				echo '<p>'.$lang['js_tracking_note'].'</p>';
 
 				echo '</div>';
@@ -692,6 +670,9 @@ class SurveyAdminSettings {
 			echo '</div>';
 
 			echo '</fieldset>';
+
+			echo '<form>';
+
 		}
 
 		/*Piskotek*/