diff --git a/himmelblaud/src/himmelblaud.rs b/himmelblaud/src/himmelblaud.rs
index 5e2f2ee6221..8904f27db7b 100644
--- a/himmelblaud/src/himmelblaud.rs
+++ b/himmelblaud/src/himmelblaud.rs
@@ -214,6 +214,7 @@ pub(crate) async fn handle_client(
             Request::NssAccountByName(account_id) => {
                 resolver.getpwnam(&account_id).await?
             }
+            Request::NssAccountByUid(uid) => resolver.getpwuid(uid).await?,
             _ => todo!(),
         };
         reqs.send(resp).await?;
@@ -227,4 +228,5 @@ pub(crate) async fn handle_client(
 
 mod himmelblaud_getpwent;
 mod himmelblaud_getpwnam;
+mod himmelblaud_getpwuid;
 mod himmelblaud_pam_auth;
diff --git a/himmelblaud/src/himmelblaud/himmelblaud_getpwuid.rs b/himmelblaud/src/himmelblaud/himmelblaud_getpwuid.rs
new file mode 100644
index 00000000000..b43948def09
--- /dev/null
+++ b/himmelblaud/src/himmelblaud/himmelblaud_getpwuid.rs
@@ -0,0 +1,45 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Himmelblau daemon implementation for nss getpwuid
+
+   Copyright (C) David Mulder 2024
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+use crate::himmelblaud::Resolver;
+use libc::uid_t;
+use ntstatus_gen::NTSTATUS;
+use sock::Response;
+
+impl Resolver {
+    pub(crate) async fn getpwuid(
+        &mut self,
+        uid: uid_t,
+    ) -> Result<Response, Box<NTSTATUS>> {
+        if let Some(upn) = self.uid_cache.fetch(uid) {
+            if let Some(entry) = self.user_cache.fetch(&upn) {
+                Ok(Response::NssAccount(Some(
+                    self.create_passwd_from_upn(&entry.upn, &entry.name)?,
+                )))
+            } else {
+                Ok(Response::NssAccount(Some(
+                    self.create_passwd_from_upn(&upn, "")?,
+                )))
+            }
+        } else {
+            Ok(Response::NssAccount(None))
+        }
+    }
+}