diff --git a/apps/hub/app/(app)/admin/event/_components/Form.tsx b/apps/hub/app/(app)/admin/event/_components/Form.tsx
index 0059d196..f2726311 100644
--- a/apps/hub/app/(app)/admin/event/_components/Form.tsx
+++ b/apps/hub/app/(app)/admin/event/_components/Form.tsx
@@ -264,6 +264,7 @@ export const Form = ({ event }: { event?: Event }) => {
 									showSearch
 									getFilter={(searchTerm) =>
 										({
+											AND: [{ eventId: event?.id }],
 											OR: [
 												{
 													User: {
diff --git a/apps/hub/app/(app)/admin/user/[id]/_components/forms.tsx b/apps/hub/app/(app)/admin/user/[id]/_components/forms.tsx
index d04c5309..25789965 100644
--- a/apps/hub/app/(app)/admin/user/[id]/_components/forms.tsx
+++ b/apps/hub/app/(app)/admin/user/[id]/_components/forms.tsx
@@ -776,13 +776,19 @@ export const AdminForm = ({
 						{discordAccount && (
 							<tr>
 								<td>
-									<Image
-										src={`https://cdn.discordapp.com/avatars/${discordAccount.discordId}/${discordAccount.avatar}.png`}
-										alt="Discord Avatar"
-										width={40}
-										height={40}
-										className="h-10 w-10 rounded-full"
-									/>
+									{discordAccount.avatar ? (
+										<Image
+											src={`https://cdn.discordapp.com/avatars/${discordAccount.discordId}/${discordAccount.avatar}.png`}
+											alt="Discord Avatar"
+											width={40}
+											height={40}
+											className="h-10 w-10 rounded-full"
+										/>
+									) : (
+										<div className="flex h-10 w-10 items-center justify-center rounded-full bg-gray-500 text-white">
+											N/A
+										</div>
+									)}
 								</td>
 								<td>{discordAccount.username}</td>
 								<td>{discordAccount.discordId}</td>
@@ -792,15 +798,20 @@ export const AdminForm = ({
 						{formerDiscordAccounts.map((account) => (
 							<tr key={account.discordId}>
 								<td>
-									{account.DiscordAccount && (
-										<Image
-											src={`https://cdn.discordapp.com/avatars/${account.DiscordAccount.discordId}/${account.DiscordAccount.avatar}.png`}
-											alt="Discord Avatar"
-											width={40}
-											height={40}
-											className="h-10 w-10 rounded-full"
-										/>
-									)}
+									{account.DiscordAccount &&
+										(account.DiscordAccount.avatar ? (
+											<Image
+												src={`https://cdn.discordapp.com/avatars/${account.DiscordAccount.discordId}/${account.DiscordAccount.avatar}.png`}
+												alt="Discord Avatar"
+												width={40}
+												height={40}
+												className="h-10 w-10 rounded-full"
+											/>
+										) : (
+											<div className="flex h-10 w-10 items-center justify-center rounded-full bg-gray-500 text-white">
+												N/A
+											</div>
+										))}
 								</td>
 								<td>{account.DiscordAccount?.username || "Unbekannt"}</td>
 								<td>{account.DiscordAccount?.discordId || "Unbekannt"}</td>