diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index b8153cb5d..7ccccf74f 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -79,7 +79,6 @@ class GDPR{
 		echo '<th>'.$lang['srv_gdpr_survey_list_survey'].'</th>';
 		echo '<th>'.$lang['srv_gdpr_survey_list_activity'].'</th>';
 		echo '<th>'.$lang['srv_gdpr_survey_list_pot_gdpr'].'</th>';
-		echo '<th>'.$lang['srv_gdpr_survey_list_gdpr'].'</th>';
 		echo '</tr>';
 
 		foreach($survey_list as $anketa){
@@ -105,11 +104,10 @@ class GDPR{
 				$anketa_potential_gdpr = $lang['no'];
 
 
-			echo '<td><a href="'.$site_url.'admin/survey/index.php?anketa='.$anketa['id'].'&a=gdpr_settings">'.$anketa['naslov'].'</a></td>';
+			echo '<td><input type="checkbox" id="gdpr_'.$anketa['id'].'" value="1" onClick="setGDPRSurvey(\''.$anketa['id'].'\', this.checked); return false;" '.($anketa['gdpr'] == '1' ? ' checked="checked"' : '').'><label for="gdpr_'.$anketa['id'].'"><a href="'.$site_url.'admin/survey/index.php?anketa='.$anketa['id'].'&a=gdpr_settings">'.$anketa['naslov'].'</a></label></td>';
 			echo '<td>'.$anketa_active.'</td>';
 			echo '<td>'.$anketa_potential_gdpr.'</td>';
 
-			echo '<td><input type="checkbox" value="1" class="pointer" onClick="setGDPRSurvey(\''.$anketa['id'].'\', this.checked); return false;" '.($anketa['gdpr'] == '1' ? ' checked="checked"' : '').'</td>';
 
 			echo '</tr>';
 		}
@@ -140,8 +138,7 @@ class GDPR{
 
         // PODATKI AVTORJA
         // Opozorilo za obvezna polja
-        if($user_settings['firstname'] == '' || $user_settings['lastname'] == '' || $user_settings['email'] == '')
-            echo '<p class="red bottom16">'.$lang['srv_gdpr_user_settings_err'].'</p>';
+		echo '<p class="red bottom16">'.$lang['srv_gdpr_user_settings_err'].'</p>';
 
 		echo '<div class="setting_horizontal_wrapper">';
 
@@ -220,10 +217,6 @@ class GDPR{
         // PODATKI PODJETJA
         echo '		<div id="gdpr_organization" '.($user_settings['type'] != '1' ? ' class="displayNone"' : '').'>';
         
-        // Opozorilo za obvezna polja
-        if($user_settings['organization'] == '' || $user_settings['organization_maticna'] == '')
-            echo '<p class="red bottom16">'.$lang['srv_gdpr_user_settings_err'].'</p>';
-		
 		echo '<div class="setting_horizontal_wrapper">';
 
 		echo '<div class="setting_holder  '.($user_settings['organization'] == '' ? 'red' : '').'">';
@@ -267,19 +260,15 @@ class GDPR{
         
 		echo '<p class="bottom16">'.$lang['srv_gdpr_user_settings_dpo'].':</p>';
         
-        // Opozorilo za obvezna polja
-        if($user_settings['dpo_firstname'] == '' || $user_settings['dpo_lastname'] == '' || $user_settings['dpo_email'] == '')
-            echo '<p class="red bottom16">'.$lang['srv_gdpr_user_settings_err'].'</p>';
-
 		echo '<div class="setting_horizontal_wrapper">';
 
 		echo '<div class="setting_holder '.($user_settings['dpo_firstname'] == '' ? ' red' : '').'">';
-		echo '<label for="dpo_firstname">'.$lang['srv_gdpr_user_settings_dpo_firstname'].':</label>';
+		echo '<label for="dpo_firstname">'.$lang['srv_gdpr_user_settings_dpo_firstname'].'*:</label>';
 		echo '<input class="large w200" id="dpo_firstname" name="dpo_firstname" value="'.$user_settings['dpo_firstname'].'" type="text">';
 		echo '</div>';
 
 		echo '<div class="setting_holder '.($user_settings['dpo_lastname'] == '' ? ' red' : '').'">';
-		echo '<label for="dpo_lastname">'.$lang['srv_gdpr_user_settings_dpo_lastname'].':</label>';
+		echo '<label for="dpo_lastname">'.$lang['srv_gdpr_user_settings_dpo_lastname'].'*:</label>';
 		echo '<input class="large w200" id="dpo_lastname" name="dpo_lastname" value="'.$user_settings['dpo_lastname'].'" type="text">';
 		echo '</div>';
 
@@ -288,7 +277,7 @@ class GDPR{
 		echo '<div class="setting_horizontal_wrapper">';
 
 		echo '<div class="setting_holder '.($user_settings['dpo_email'] == '' ? ' red' : '').'">';
-		echo '<label for="dpo_email">'.$lang['srv_gdpr_user_settings_dpo_email'].':</label>';
+		echo '<label for="dpo_email">'.$lang['srv_gdpr_user_settings_dpo_email'].'*:</label>';
 		echo '<input class="large w200 '.(isset($error['dpo_email']) ? ' red' : '').'" id="dpo_email" name="dpo_email" value="'.$user_settings['dpo_email'].'" type="text"> '.(isset($error['dpo_email']) ? '<span class="red italic">'.$lang['srv_remind_email_hard'].'</span>' : '');
 		echo '</div>';