diff --git a/components/Avatar.vue b/components/Avatar.vue
index 06d36ad..dcb3b7e 100644
--- a/components/Avatar.vue
+++ b/components/Avatar.vue
@@ -6,7 +6,7 @@
 	<DefaultIcon v-else
 		class="display-avatar"
 		:name="displayName"
-		:seed="user.uuid"
+		:seed="getUserUuid(props.profile)"
 		:alt="displayName" />
 </template>
 
@@ -14,25 +14,14 @@
 import { NuxtImg } from '#components';
 import type { GuildMemberResponse, UserResponse } from '~/types/interfaces';
 
-const { getDisplayName } = useProfile()
+const { getDisplayName, getAvatarUrl, getUserUuid } = useProfile()
 
 const props = defineProps<{
 	profile: UserResponse | GuildMemberResponse,
 }>();
 
 const displayName = getDisplayName(props.profile)
-let user: UserResponse
-let displayAvatar: string | null
-
-if ("username" in props.profile) {
-	// assume it's a UserResponse
-	displayAvatar = props.profile.avatar
-	user = props.profile
-} else {
-	// assume it's a GuildMemberResponse
-	displayAvatar = props.profile.user.avatar
-	user = props.profile.user
-}
+const displayAvatar = getAvatarUrl(props.profile)
 
 </script>
 
diff --git a/components/Modal/ProfilePopup.vue b/components/Modal/ProfilePopup.vue
index b99a9ea..9c179a2 100644
--- a/components/Modal/ProfilePopup.vue
+++ b/components/Modal/ProfilePopup.vue
@@ -62,7 +62,7 @@ import type { GuildMemberResponse, ModalProps, UserResponse } from '~/types/inte
 import VerticalSpacer from '../UserInterface/VerticalSpacer.vue';
 import Button from '../UserInterface/Button.vue';
 
-const { getDisplayName, getUsername, getPronouns, getAboutMe, getRegistrationDate, getGuildJoinDate, getFriendsSince, getUuid } = useProfile()
+const { getDisplayName, getUsername, getPronouns, getAboutMe, getRegistrationDate, getGuildJoinDate, getFriendsSince, getUserUuid } = useProfile()
 const { addFriend, fetchMe } = useApi();
 
 const props = defineProps<ModalProps & {
@@ -81,7 +81,7 @@ const registrationDate = getRegistrationDate(props.profile)
 const joinDate = getGuildJoinDate(props.profile)
 const friendsSince = await getFriendsSince(props.profile)
 
-const uuid = getUuid(props.profile)
+const uuid = getUserUuid(props.profile)
 
 
 function toDateString(date: Date): string {
diff --git a/composables/profile.ts b/composables/profile.ts
index f3515e6..25b18c2 100644
--- a/composables/profile.ts
+++ b/composables/profile.ts
@@ -3,7 +3,7 @@ import type { GuildMemberResponse, UserResponse } from "~/types/interfaces"
 const { fetchFriends } = useApi();
 
 export const useProfile = () => {
-	function getAboutMe (profile: UserResponse | GuildMemberResponse): string | null {
+	function getAboutMe(profile: UserResponse | GuildMemberResponse): string | null {
 		if ("username" in profile) {
 			return profile.about
 		} else {
@@ -11,7 +11,7 @@ export const useProfile = () => {
 		}
 	}
 
-	function getDisplayName (profile: UserResponse | GuildMemberResponse): string  {
+	function getDisplayName(profile: UserResponse | GuildMemberResponse): string  {
 		if ("username" in profile) {
 			// assume it's a UserResponse
 			if (profile.display_name) return profile.display_name
@@ -24,7 +24,15 @@ export const useProfile = () => {
 		}
 	}
 
-	async function getFriendsSince (profile: UserResponse | GuildMemberResponse): Promise<Date | null> {
+	function getAvatarUrl(profile: UserResponse | GuildMemberResponse): string | null {
+		if ("username" in profile) {
+			return profile.avatar
+		} else {
+			return profile.user.avatar
+		}
+	}
+
+	async function getFriendsSince(profile: UserResponse | GuildMemberResponse): Promise<Date | null> {
 		let user_uuid: string;
 
 		if ("username" in profile) {
@@ -42,15 +50,15 @@ export const useProfile = () => {
 		return null
 	}
 
-	function getGuildJoinDate (profile: UserResponse | GuildMemberResponse): Date | null {
+	function getGuildJoinDate(profile: UserResponse | GuildMemberResponse): Date | undefined {
 		if ("username" in profile) {
-			return null
+			return undefined
 		} else {
 			return uuidToDate(profile.uuid)
 		}
 	}
 
-	function getPronouns (profile: UserResponse | GuildMemberResponse): string | null  {
+	function getPronouns(profile: UserResponse | GuildMemberResponse): string | null {
 		if ("username" in profile) {
 			return profile.pronouns
 		} else {
@@ -58,7 +66,7 @@ export const useProfile = () => {
 		}
 	}
 
-	function getRegistrationDate (profile: UserResponse | GuildMemberResponse): Date | null {
+	function getRegistrationDate(profile: UserResponse | GuildMemberResponse): Date {
 		if ("username" in profile) {
 			return uuidToDate(profile.uuid)
 		} else {
@@ -66,7 +74,7 @@ export const useProfile = () => {
 		}
 	}
 
-	function getUsername (profile: UserResponse | GuildMemberResponse): string {
+	function getUsername(profile: UserResponse | GuildMemberResponse): string {
 		if ("username" in profile) {
 			return profile.username
 		} else {
@@ -74,22 +82,32 @@ export const useProfile = () => {
 		}
 	}
 
-	function getUuid (profile: UserResponse | GuildMemberResponse): string | null {
+	function getUserUuid(profile: UserResponse | GuildMemberResponse): string {
 		if ("username" in profile) {
 			return profile.uuid
 		} else {
 			return profile.user.uuid
 		}
 	}
+
+	function getUser(profile: UserResponse | GuildMemberResponse): UserResponse {
+		if ("username" in profile) {
+			return profile
+		} else {
+			return profile.user
+		}
+	}
 	
 	return {
 		getAboutMe,
 		getDisplayName,
+		getAvatarUrl,
 		getFriendsSince,
 		getGuildJoinDate,
 		getRegistrationDate,
 		getPronouns,
 		getUsername,
-		getUuid		
+		getUserUuid,
+		getUser
 	}
 }