diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 5b56afc35..c0e6f4f18 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -5406,7 +5406,7 @@ class SurveyAdminAjax {
 		if (mysqli_num_rows($sql) > 0) $add = false;
 		
 		if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
-			$link = 'main/survey/uporabnost.php?anketa=' . $anketa ;
+			$link = 'main/survey/uporabnost.php?anketa=' . SurveyInfo::getInstance()->getSurveyHash() ;
 		else
 			$link = 'main/survey/index.php?anketa=' . SurveyInfo::getInstance()->getSurveyHash();
 		
diff --git a/admin/survey/api/class.ApiSurvey.php b/admin/survey/api/class.ApiSurvey.php
index b3d765409..e8484ff20 100644
--- a/admin/survey/api/class.ApiSurvey.php
+++ b/admin/survey/api/class.ApiSurvey.php
@@ -3524,7 +3524,7 @@ class ApiSurvey {
                     $add = false;
 
                 if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
-                    $link = 'main/survey/uporabnost.php?anketa=' . $anketa . '&skupina=' . $vre_id;
+                    $link = 'main/survey/uporabnost.php?anketa=' . SurveyInfo::getInstance()->getSurveyHash() . '&skupina=' . $vre_id;
                 else
                     $link = 'main/survey/index.php?anketa=' . SurveyInfo::getInstance()->getSurveyHash() . '&skupina=' . $vre_id;
 
@@ -3631,7 +3631,7 @@ class ApiSurvey {
                     $add = false;
 
                 if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
-                    $link = 'main/survey/uporabnost.php?anketa=' . $anketa . '&skupina=' . $vre_id;
+                    $link = 'main/survey/uporabnost.php?anketa=' . SurveyInfo::getInstance()->getSurveyHash() . '&skupina=' . $vre_id;
                 else
                     $link = 'main/survey/index.php?anketa=' . SurveyInfo::getInstance()->getSurveyHash() . '&skupina=' . $vre_id;
 
diff --git a/admin/survey/classes/class.Library.php b/admin/survey/classes/class.Library.php
index 88d653362..1257648cd 100644
--- a/admin/survey/classes/class.Library.php
+++ b/admin/survey/classes/class.Library.php
@@ -302,7 +302,7 @@ class Library {
                                 // nova anketa kot template iz knjiznice
                                 echo '<a href="/" onclick="anketa_copy(\''.$row1['id'].'\'); return false;" title="'.$lang['srv_library_use_survey'].'"><span class="faicon copy"></span> <span class="library_item_setting_text">'.$lang['srv_anketacopy'].'</span></a> ';
                                 if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))                                
-                                    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.$row1['id'].'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> <span class="library_item_setting_text">'.$lang['srv_poglejanketo2'].'</span></a> ';
+                                    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> <span class="library_item_setting_text">'.$lang['srv_poglejanketo2'].'</span></a> ';
                                 else
                                     echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> <span class="library_item_setting_text">'.$lang['srv_poglejanketo2'].'</span></a> ';
                                 
@@ -321,7 +321,7 @@ class Library {
                             }
                             else {
                                 if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))                                
-                                    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.$row1['id'].'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span></a>';
+                                    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span></a>';
                                 else
                                     echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span></a>';
                                 
@@ -493,7 +493,7 @@ class Library {
 				// Preview
                 
                 if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
-				    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.$row1['id'].'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a> ';
+				    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a> ';
                 else
 				    echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'"><span class="faicon preview"></span> '.$lang['srv_poglejanketo2'].'</a> ';
 				
diff --git a/admin/survey/classes/class.SurveyInfo.php b/admin/survey/classes/class.SurveyInfo.php
index dd021448f..c171f9420 100644
--- a/admin/survey/classes/class.SurveyInfo.php
+++ b/admin/survey/classes/class.SurveyInfo.php
@@ -667,7 +667,7 @@ class SurveyInfo
 			} 
 			else {		
 				if (self::checkSurveyModule('uporabnost') && $uporabnost == true) // na redirectih pa v form action ne sme it na uporabnost (ker se odpira znotraj frama)
-					$link = $site_url.'main/survey/uporabnost.php?anketa=' . $anketa ;
+					$link = $site_url.'main/survey/uporabnost.php?anketa=' . $anketa_string;
 				else
 					$link = $site_url.'a/' . $anketa_string ;	
 			}
diff --git a/admin/survey/classes/class.SurveySkupine.php b/admin/survey/classes/class.SurveySkupine.php
index 33979ecb9..9ecfd4736 100644
--- a/admin/survey/classes/class.SurveySkupine.php
+++ b/admin/survey/classes/class.SurveySkupine.php
@@ -284,7 +284,7 @@ class SurveySkupine {
                     if (strlen($nice_url) < 3) $add = false;
                                     
                     if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
-                        $link = 'main/survey/uporabnost.php?anketa='.$anketa.'&skupina='.$vre_id;
+                        $link = 'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&skupina='.$vre_id;
                     else
                         $link = 'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&skupina='.$vre_id;
                     
diff --git a/admin/survey/modules/mod_EVOLI/class.EvoliForm.php b/admin/survey/modules/mod_EVOLI/class.EvoliForm.php
index 32ba21689..631814071 100644
--- a/admin/survey/modules/mod_EVOLI/class.EvoliForm.php
+++ b/admin/survey/modules/mod_EVOLI/class.EvoliForm.php
@@ -823,7 +823,7 @@ class EvoliForm {
 				if (strlen($nice_url) < 3) $add = false;
 								
 				if (SurveyInfo::getInstance()->checkSurveyModule('uporabnost'))
-					$link = 'main/survey/uporabnost.php?anketa='.$anketa.'&skupina='.$vre_id;
+					$link = 'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&skupina='.$vre_id;
 				else
 					$link = 'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&skupina='.$vre_id;
 				
diff --git a/main/survey/uporabnost.php b/main/survey/uporabnost.php
index d5036cd89..d12495b6d 100644
--- a/main/survey/uporabnost.php
+++ b/main/survey/uporabnost.php
@@ -14,7 +14,8 @@ echo '  <title>OneClick Survey</title>'."\n\r";
 echo '  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'."\n\r";
 echo '</head>';
 
-$anketa = $_GET['anketa'];
+$anketa_hash = $_GET['anketa'];
+$anketa = getSurveyIdFromHash($anketa_hash);
 
 $sql = sisplet_query("SELECT uporabnost_link FROM srv_anketa WHERE id = '$anketa'");
 $row = mysqli_fetch_array($sql);