diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 4dce97496..5df62f42c 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -4831,8 +4831,9 @@ class SurveyAdminSettings {
 			echo '<table>';
 			echo '<tr>';
 			echo '<th>';
-			//echo '<input type="checkbox" id="user_access_check_all" name="user_access_check_all"></input>';
-			echo '<label for="user_access_check_all">' . $lang['srv_dostop_users_username'] . '</label></th>';
+			//echo '<input type="checkbox" id="user_access_check_all" name="user_access_check_all"></input><label class="empty" for="user_access_check_all"></label>';
+			echo '</th>';
+			echo '<th>' . $lang['srv_dostop_users_username'] . '</th>';
 			echo '<th>' . $lang['srv_dostop_users_email'] . '</th>';
 			echo '<th></th>';
 			echo '</tr>';
@@ -4845,7 +4846,8 @@ class SurveyAdminSettings {
 					echo '	<input type="hidden" name="uid[]" value="' . $row1['id'] . '" />' . "\n";
 
 				echo '<tr id="div_for_uid_' . $row1['id'] . '" name="dostop_active_uid">';
-				echo '<td><input type="checkbox" name="uid[]" value="' . $row1['id'] . '" id="uid_' . $row1['id'] . '" checked="checked" '.($avtorRow['insert_uid'] == $row1['id'] || $global_user_id == $row1['id'] ? ' disabled="disabled"' : '').' autocomplete="off"/><label for="uid_' . $row1['id'] . '" title="' . $row1['email'] . '">'.$row1['name'] . ($avtorRow['insert_uid'] == $row1['id'] ? ' (' . $lang['author'] . ')' : '') . '</label></td>';
+				echo '<td><input type="checkbox" name="uid[]" value="' . $row1['id'] . '" id="uid_' . $row1['id'] . '" checked="checked" '.($avtorRow['insert_uid'] == $row1['id'] || $global_user_id == $row1['id'] ? ' disabled="disabled"' : '').' autocomplete="off"/><label class="empty" for="uid_' . $row1['id'] . '" title="' . $row1['email'] . '"></label></td>';
+				echo '<td>'.$row1['name'] . ($avtorRow['insert_uid'] == $row1['id'] ? ' (' . $lang['author'] . ')' : '') .'</td>';
 				echo '<td>'.$row1['email'].'</td>';
 				echo '<td><div class="icon_holder multiple"><a><span class="faicon edit" onclick="javascript:anketa_user_dostop(\''.$row1['id'].'\');"></span></a>';
 				//echo '<a><span class="faicon trash empty" onclick="_______IZBRIS DOSTOPA ZA ENEGA UPORABNIKA______"></span></a></div>';
diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index ad1c84103..c84097f84 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -76,6 +76,7 @@ class GDPR{
 		echo '<table class="gdpr_surveys">';
 
 		echo '<tr>';
+		echo '<th class="center">GDPR</th>';
 		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>';
@@ -104,7 +105,8 @@ class GDPR{
 				$anketa_potential_gdpr = $lang['no'];
 
 
-			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 class="center"><input type="checkbox" id="gdpr_'.$anketa['id'].'" value="1" onClick="setGDPRSurvey(\''.$anketa['id'].'\', this.checked); return false;" '.($anketa['gdpr'] == '1' ? ' checked="checked"' : '').'><label class="empty" for="gdpr_'.$anketa['id'].'"></label></td>';
+			echo '<td><a href="'.$site_url.'admin/survey/index.php?anketa='.$anketa['id'].'&a=gdpr_settings">'.$anketa['naslov'].'</a></td>';
 			echo '<td>'.$anketa_active.'</td>';
 			echo '<td>'.$anketa_potential_gdpr.'</td>';
 
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 8aa523c44..5e8c3e396 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -7228,6 +7228,9 @@ input[type=radio] + label:before, input[type=checkbox] + label:before {
   font-size: 18px;
   vertical-align: -1px;
 }
+input[type=radio] + label.empty:before, input[type=checkbox] + label.empty:before {
+  letter-spacing: 0;
+}
 input[type=radio]:checked + label:before, input[type=checkbox]:checked + label:before {
   color: #1E88E5;
 }
diff --git a/resources/sass/admin_new/components/form/input.scss b/resources/sass/admin_new/components/form/input.scss
index 3b33590f9..66fac6e8e 100644
--- a/resources/sass/admin_new/components/form/input.scss
+++ b/resources/sass/admin_new/components/form/input.scss
@@ -92,6 +92,13 @@ input {
         font-size: 18px;
         vertical-align: -1px;
     }
+
+    //Za prazne labele
+    &[type=radio] + label.empty:before,
+    &[type=checkbox] + label.empty:before {
+        letter-spacing: 0;
+    }
+
     &[type=radio]:checked + label:before,
     &[type=checkbox]:checked + label:before {
         color: $blue;