diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 5b8920b6e..ed9b18d70 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -4908,13 +4908,18 @@ 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 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>';
-				echo '</td>';
-				echo '</tr>';
+				
+                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>';
+
+                // Avtor ne rabi ikone za urejanje
+                echo '  <td>';
+                if($avtorRow['insert_uid'] != $row1['id'])
+                    echo '      <div class="icon_holder multiple"><a><span class="faicon edit" onclick="javascript:anketa_user_dostop(\''.$row1['id'].'\');"></span></a>';
+                echo '  </td>';
+				
+                echo '</tr>';
 			}
 
 			echo '</table>';
@@ -4922,7 +4927,6 @@ class SurveyAdminSettings {
 			//echo '<a class="noline undertable" href="#" onClick="________IZBRIS DOSTOPA ZA VSE OZNAČENE____________"><span class="faicon trash empty link-right"></span>'.$lang['srv_dostop_users_removeselected'].'</a>';
 
 		}
-
 		// Prikazemo vse userje, ki jih lahko uporabnik dodaja
 		else{
 			$sql1 = $this->db_select_users_forLevel($this->anketa);
@@ -9032,7 +9036,7 @@ class SurveyAdminSettings {
 		$expire =  $_expire[2].'.'.$_expire[1].'.'.$_expire[0];
 		
 		echo '<fieldset>';
-		echo '<legend>'.$lang['srv_activate_duration_2'].' '.Help::display('srv_activity_quotas').'</legend>';
+		echo '<legend>'.$lang['srv_activate_duration_2'].'</legend>';
 		echo '<div class="setting_holder" id="start">';
 		echo '<span class="setting_title">' . $lang['srv_activate_duration_manual_from'].'</span>';
 		echo '<div class="icon_holder">';
diff --git a/lang/1.php b/lang/1.php
index beec27ef7..b18b4827e 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5217,7 +5217,7 @@ $lang = array (
 	'srv_password'								=>	"Geslo za dostop do izpolnjevanja ankete",
 	'srv_password_remove'						=>	"Odstrani",
 	'srv_password_add_mass'						=>	"Masovni vnos gesel",
-    'srv_password_add_mass_instructions'		=>	"Vnesite seznam gesel kjer je vsako geslo v svoji vrstici:",
+    'srv_password_add_mass_instructions'		=>	"Vnesite seznam gesel, kjer je vsako geslo v svoji vrstici:",
     'srv_password_add_mass_sample'		        =>  "(npr. Geslo1,Geslo2,Geslo3...)",
 	'srv_password_add_mass_execute'				=>	"Dodaj gesla",
 	'srv_interno_ime'							=>	"(Interno ime se uporablja pri urejanju ankete.)",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 4223ae3df..6b228c171 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -6854,11 +6854,11 @@ a.help {
 .qtip .qtip-wrapper .qtip-contentWrapper .qtip-content ol {
   margin-bottom: 8px;
   margin: 8px 0 8px 0;
-  padding: 0 0 0 20px;
+  padding: 0;
 }
 .qtip .qtip-wrapper .qtip-contentWrapper .qtip-content ul li,
 .qtip .qtip-wrapper .qtip-contentWrapper .qtip-content ol li {
-  margin: 4px 0;
+  margin: 4px 0 4px 16px;
 }
 .qtip .qtip-wrapper .qtip-contentWrapper .qtip-content .qtip-more {
   display: block;
diff --git a/resources/sass/admin_new/components/hover/qtip.scss b/resources/sass/admin_new/components/hover/qtip.scss
index 7cf855b31..247faa147 100644
--- a/resources/sass/admin_new/components/hover/qtip.scss
+++ b/resources/sass/admin_new/components/hover/qtip.scss
@@ -96,10 +96,10 @@
                 ol{
                     margin-bottom: 8px;
                     margin: 8px 0 8px 0;
-                    padding: 0 0 0 20px;
+                    padding: 0;
 
                     li{
-                        margin: 4px 0;
+                        margin: 4px 0 4px 16px;
                     }
                 }