diff --git a/Gopkg.toml b/Gopkg.toml
index 56fd4154d480097761aefd7c8bfe6a1b7fa872d3..01bdbdfa245d9f2ef7fe41feb935b83a142944eb 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -1,5 +1,5 @@
 [[constraint]]
-  branch = "master"
+  branch = "login-with-vereign"
   name = "code.vereign.com/code/viam-apis"
 
 [[constraint]]
diff --git a/handler/handler.go b/handler/handler.go
index aef13b5408e64d07dd62a4e5556e370ebeb1fe4a..7bb3e9ec0a825ccf64fba71ce65e6d551b90d339 100644
--- a/handler/handler.go
+++ b/handler/handler.go
@@ -245,7 +245,7 @@ func (s *KeyStorageServerImpl) GetKeyId(ctx context.Context, in *api.GetKeyIdByK
 		return keyIdResponse, nil
 	}
 
-	entity, err := clientutils.GetLastEntity(entitiesMagamentClient, auth.Uuid)
+	entity, err := clientutils.GetLastEntity(entitiesMagamentClient, in.EntityUUID)
 
 	if err != nil {
 		return nil, err