diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 9befac29e..5f252a7c5 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -1021,6 +1021,8 @@ class SurveyAdminSettings {
 				echo '</div>';
 				echo '</div>';
 
+				echo '<div>';
+
 				echo '<table id="passwords_table" '.(($spr_id == 0) ? 'class="displayNone"' : '').'>';
 
 					echo '<tr>';
@@ -1041,6 +1043,8 @@ class SurveyAdminSettings {
 					}
 
 				echo '</table>';
+				echo '</div>';
+
 
 				echo '<div class="setting_holder">';
 				echo '<a class="noline" href="#" onClick="display_add_passwords_mass();"><span class="faicon clipboard empty link-right"></span>'.$lang['srv_password_add_mass'].'</a>';
@@ -1492,10 +1496,12 @@ class SurveyAdminSettings {
 				
 				echo '<fieldset><legend>' . $lang['srv_dostop_users'] . '' . Help :: display('srv_dostop_users'). '</legend>';
 
-                if($admin_type == 0 || $admin_type == 1){
+                /**if($admin_type == 0 || $admin_type == 1){
+					echo '<div class="setting_holder">';
 				    echo '<span id="dostop_active_show_1"><a href="#" onClick="dostopActiveShowAll(\'true\'); return false;">'.$lang['srv_dostop_show_all'].'</a></span>';
 				    echo '<span id="dostop_active_show_2" class="displayNone"><a href="#" onClick="dostopActiveShowAll(\'false\'); return false;">'.$lang['srv_dostop_hide_all'].'</a></span>';
-                }
+					echo '</div>';
+				}**/
 
 				echo '<div id="dostop_users_list">';
 				$this->display_dostop_users(0);
@@ -3523,18 +3529,18 @@ class SurveyAdminSettings {
 			echo '<legend>' . $lang['srv_alert_surveydelete'] . '</legend>';
 			echo '<p>'.$lang['srv_alert_surveydelete_text'].'</p>';
 
-			echo '<div class="setting_holder">';
-			echo '<input type="checkbox" name="alert_delete_author" id="alert_delete_author" value="1" onChange="change_alert_respondent(\'delete_author\', $(this));return false;"' . ($rowAlert['delete_author'] == 1 ? ' checked' : '') . '>';
-			echo '</div>';
+			echo '<input type="checkbox" name="alert_delete_author" id="alert_delete_author" value="1" onChange="change_alert_respondent(\'delete_author\', $(this));return false;"' . ($rowAlert['delete_author'] == 1 ? ' checked' : '') . '><label for="alert_delete_author"></label>';
 
 			echo '<span id="label_alert_delete_author">';
 			$this->display_alert_label('delete_author',($rowAlert['delete_author'] == 1));
-			echo '</span></p>';
-			echo '<p><input type="checkbox" name="alert_delete_other"  id="alert_delete_other"  value="1"' . (($rowAlert['delete_other'] == 1 || ($rowAlert['delete_other_emails'] && $rowAlert['delete_other'] != 0)) ? ' checked' : '') . ' onchange="toggleStatusAlertOtherCheckbox(\'delete_other\');"><label for="alert_delete_other">' . $lang['email_prejemniki'] . $lang['email_one_per_line'] . '</label></p>';
+			echo '<div class="setting_holder">';
+			echo '<input type="checkbox" name="alert_delete_other"  id="alert_delete_other"  value="1"' . (($rowAlert['delete_other'] == 1 || ($rowAlert['delete_other_emails'] && $rowAlert['delete_other'] != 0)) ? ' checked' : '') . ' onchange="toggleStatusAlertOtherCheckbox(\'delete_other\');"><label for="alert_delete_other">' . $lang['email_prejemniki'] . $lang['email_one_per_line'] . '</label>';
+			echo '</div>';
+			echo '<div class="setting_holder">';
 			echo '<p id="alert_holder_delete_other_emails" '.($rowAlert['delete_other'] == 0 ? 'class="displayNone"' : '' ).'>';
 			echo '<label for="alert_delete_other_emails">' . $lang['email'] . ':</label>';
 			echo '<textarea name="alert_delete_other_emails" id="alert_delete_other_emails" style="height:100px" >' . $rowAlert['delete_other_emails'] . '</textarea>';
-			echo '</p>';
+			echo '</div>';
 
 			echo '<p class="bold caps bottom16">'.$lang['message_content'].'</p>';
 
@@ -4819,27 +4825,26 @@ class SurveyAdminSettings {
 
 			echo '<table>';
 			echo '<tr>';
-			echo '<th><input type="checkbox" id="user_access_check_all" name="user_access_check_all"></input></th>';
+			echo '<th><input type="checkbox" id="user_access_check_all" name="user_access_check_all"></input><label for="user_access_check_all"></label></th>';
 			echo '<th></th>';
 			echo '<th></th>';
 			echo '<th>' . $lang['srv_dostop_users_username'] . '</th>';
 			echo '<th>' . $lang['srv_dostop_users_email'] . '</th>';
-			echo '<th>' . $lang['srv_dostop_users_addedby'] . '</th>';
 			echo '</tr>';
 			
 			$sql1 = sisplet_query("SELECT u.name, u.surname, u.id, u.email FROM users u, srv_dostop d WHERE d.ank_id='$this->anketa' AND d.uid=u.id");
 			while ($row1 = mysqli_fetch_array($sql1)) {
-				
+
 				// Da ga ne pocistimo, ce je disablan (sam sebe ne more odstranit in avtorja se ne sme odstranit)
 				if($avtorRow['insert_uid'] == $row1['id'] || $global_user_id == $row1['id'])
 					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"/></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 for="uid_' . $row1['id'] . '" title="' . $row1['email'] . '"></label></td>';
 				echo '<td><a><span class="faicon edit" onclick="javascript:anketa_user_dostop(\''.$row1['id'].'\');"></span></a></td>';
 				echo '<td><a><span class="faicon trash empty" onclick="_______IZBRIS DOSTOPA______"></span></a></td>';
 				echo '<td><label for="uid_' . $row1['id'] . '" title="' . $row1['email'] . '">'.$row1['name'] . ($avtorRow['insert_uid'] == $row1['id'] ? ' (' . $lang['author'] . ')' : '') . '</label></td>';
-				echo '<td>hardcoded@email</td>';
+				echo '<td>'.$row1['email'].'</td>';
 				echo '<td>mstupar</td>';
 				echo '</tr>';
 			}
@@ -4917,7 +4922,7 @@ class SurveyAdminSettings {
 		echo '<div class="setting_holder">';
 		echo '<div class="setting_item">';
 		echo '<input type="checkbox" id="addusers_note_checkbox" onClick="dostopNoteToggle();">';
-        echo '<label for="addusers_note">'.$lang['srv_dostop_adduserstxt_note'].'</label>';
+        echo '<label for="addusers_note_checkbox">'.$lang['srv_dostop_adduserstxt_note'].'</label>';
         echo '</div>';
 		echo '<div class="setting_item">';
         echo '<textarea name="addusers_note" id="addusers_note">'.$lang['srv_dostop_adduserstxt_note_text'].'</textarea>';
diff --git a/lang/1.php b/lang/1.php
index 8673cb682..80c1d0a98 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -6254,7 +6254,6 @@ $lang = array (
 	'srv_dostop_users_list'						=>	'Seznam uporabnikov z dostopom do urejanja ankete',
 	'srv_dostop_users_username'					=>	'Uporabniško ime',
 	'srv_dostop_users_email'					=>	'Email naslov',
-	'srv_dostop_users_addedby'					=>	'Dostop je dodelil',
 	'srv_dostop_users_removeselected'			=>	'Odstrani označene',
 	'srv_dataIcons_multiple'					=>	'Kombinirana tabela',
 	'srv_incremental_lock_message'				=>	'Poteka priprava podatkov za pregled in analize. Prosimo počakajte trenutek!',
diff --git a/lang/2.php b/lang/2.php
index 5e8207391..68f4c7240 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -6150,7 +6150,6 @@ $lang = array (
 	'srv_dostop_users_list'						=>	'List of users with access to editing the survey',
 	'srv_dostop_users_username'					=>	'Username',
 	'srv_dostop_users_email'					=>	'Email address',
-	'srv_dostop_users_addedby'					=>	'Access given by',
 	'srv_dostop_users_removeselected'			=>	'Remove selected',
 	'srv_dataIcons_multiple'					=>	'Multiple table',
 	'srv_incremental_lock_message'				=>	'We are preparing data for review and analysis. Please wait a moment!',