diff --git a/kv/user.go b/kv/user.go
index 3968d4d777..1ce9c1a93d 100644
--- a/kv/user.go
+++ b/kv/user.go
@@ -293,12 +293,12 @@ func (s *Service) forEachUser(ctx context.Context, tx Tx, fn func(*influxdb.User
 		return err
 	}
 
-	cur, err := b.Cursor()
+	cur, err := b.ForwardCursor(nil)
 	if err != nil {
 		return ErrInternalUserServiceError(err)
 	}
 
-	for k, v := cur.First(); k != nil; k, v = cur.Next() {
+	for k, v := cur.Next(); k != nil; k, v = cur.Next() {
 		u, err := UnmarshalUser(v)
 		if err != nil {
 			return err
diff --git a/kv/variable.go b/kv/variable.go
index 7f8e946be5..048f235423 100644
--- a/kv/variable.go
+++ b/kv/variable.go
@@ -1,7 +1,6 @@
 package kv
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"strings"
@@ -52,19 +51,18 @@ func (s *Service) findOrganizationVariables(ctx context.Context, tx Tx, orgID in
 		return nil, err
 	}
 
-	// TODO(leodido): support find options
-	cur, err := idx.Cursor()
-	if err != nil {
-		return nil, err
-	}
-
 	prefix, err := orgID.Encode()
 	if err != nil {
 		return nil, err
 	}
 
+	cur, err := idx.ForwardCursor(prefix, WithCursorPrefix(prefix))
+	if err != nil {
+		return nil, err
+	}
+
 	variables := []*influxdb.Variable{}
-	for k, _ := cur.Seek(prefix); bytes.HasPrefix(k, prefix); k, _ = cur.Next() {
+	for k, _ := cur.Next(); k != nil; k, _ = cur.Next() {
 		_, id, err := decodeVariableOrgsIndexKey(k)
 		if err != nil {
 			return nil, err