diff --git a/src/frontend/src/components/render/User.tsx b/src/frontend/src/components/render/User.tsx
index 8f77476cde..85c508cb70 100644
--- a/src/frontend/src/components/render/User.tsx
+++ b/src/frontend/src/components/render/User.tsx
@@ -1,11 +1,17 @@
+import { IconUser, IconUsersGroup } from '@tabler/icons-react';
 import { ReactNode } from 'react';
 
 import { RenderInlineModel } from './Instance';
 
 export function RenderOwner({ instance }: { instance: any }): ReactNode {
-  // TODO: Icon based on user / group status?
-
-  return instance && <RenderInlineModel primary={instance.name} />;
+  return (
+    instance && (
+      <RenderInlineModel
+        primary={instance.name}
+        suffix={instance.label == 'group' ? <IconUsersGroup /> : <IconUser />}
+      />
+    )
+  );
 }
 
 export function RenderUser({ instance }: { instance: any }): ReactNode {
diff --git a/src/frontend/src/forms/BuildForms.tsx b/src/frontend/src/forms/BuildForms.tsx
index af44bb70e6..b89bed64fd 100644
--- a/src/frontend/src/forms/BuildForms.tsx
+++ b/src/frontend/src/forms/BuildForms.tsx
@@ -54,7 +54,10 @@ export function buildOrderFields(): ApiFormFieldSet {
       icon: <IconUser />
     },
     responsible: {
-      icon: <IconUsersGroup />
+      icon: <IconUsersGroup />,
+      filters: {
+        is_active: true
+      }
     }
   };
 }
diff --git a/src/frontend/src/forms/PartForms.tsx b/src/frontend/src/forms/PartForms.tsx
index 596f4e73b3..dbf8c5227e 100644
--- a/src/frontend/src/forms/PartForms.tsx
+++ b/src/frontend/src/forms/PartForms.tsx
@@ -35,7 +35,11 @@ export function partFields({
     },
     default_expiry: {},
     minimum_stock: {},
-    responsible: {},
+    responsible: {
+      filters: {
+        is_active: true
+      }
+    },
     component: {},
     assembly: {},
     is_template: {},