diff --git a/.changelog/14248.txt b/.changelog/14248.txt
new file mode 100644
index 00000000000..32b4e40e9e0
--- /dev/null
+++ b/.changelog/14248.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+client: Fixed a bug where user lookups would hang or panic
+```
diff --git a/GNUmakefile b/GNUmakefile
index c506dfec90f..5f1d99c6ee2 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -21,7 +21,7 @@ ifndef BIN
 BIN := $(GOPATH)/bin
 endif
 
-GO_TAGS ?=
+GO_TAGS ?= osusergo
 
 ifeq ($(CI),true)
 GO_TAGS := codegen_generated $(GO_TAGS)