diff --git a/admin/survey/classes/class.User.php b/admin/survey/classes/class.User.php
index 01582f8f9..95fb262bd 100644
--- a/admin/survey/classes/class.User.php
+++ b/admin/survey/classes/class.User.php
@@ -115,7 +115,7 @@ class User {
         if(!empty($user_id)){
 
             // Ce se nimamo zabelezenega aai_id-ja (uuid), ga pri prvi novi prijavi zabelezimo
-            sisplet_query("UPDATE users SET aai_id='".$aai_id."' WHERE user_id='".$user_id->id."' AND email='".$email."' AND aai_id=''");
+            sisplet_query("UPDATE users SET aai_id='".$aai_id."' WHERE id='".$user_id->id."' AND email='".$email."' AND aai_id=''");
 
             return $user_id->id;
         }
@@ -125,7 +125,7 @@ class User {
         if(!empty($user_id)){
 
             // Ce obstaja pomeni da je bil aai email spremenjen - ga popravimo se v bazi
-            sisplet_query("UPDATE users SET email='".$email."' WHERE user_id='".$user_id->id."' AND aai_id='".$aai_id."'");
+            sisplet_query("UPDATE users SET email='".$email."' WHERE id='".$user_id->id."' AND aai_id='".$aai_id."'");
 
             return $user_id->id;
         }
diff --git a/sql/update2.sql b/sql/update2.sql
index e78c12971..ae0a82494 100644
--- a/sql/update2.sql
+++ b/sql/update2.sql
@@ -9571,11 +9571,12 @@ UPDATE misc SET value='21.09.21' WHERE what="version";
 
 ## Ankete vec ne stevilcimo ampak jih identificiramo po hashu
 ALTER TABLE srv_anketa ADD hash VARCHAR(8) CHARACTER SET utf8 NOT NULL DEFAULT '' AFTER id;
-ALTER TABLE srv_anketa ADD UNIQUE (hash);
 
 ## Stare ankete imajo za hash kar id (da je kompatibilno za nazaj ker so ze objavljene)
 UPDATE srv_anketa SET hash=id;
 
+ALTER TABLE srv_anketa ADD UNIQUE (hash);
+
 UPDATE misc SET value='22.09.30' WHERE what="version";
 
 INSERT INTO srv_help (what, help) VALUES ('srv_glasovanje_archive', 'Dodaj anketo v arhiv glasovanja');