diff --git a/frontend/src/app/bans/history/history.component.html b/frontend/src/app/bans/history/history.component.html
index ebc0413..5591785 100644
--- a/frontend/src/app/bans/history/history.component.html
+++ b/frontend/src/app/bans/history/history.component.html
@@ -21,8 +21,8 @@
       <tr *ngFor="let entry of history">
         <td class="historyType">{{ getType(entry) }}</td>
         <td class="historyPlayer">
-          <img class="avatar" ngSrc="https://cravatar.eu/avatar/cba80e47fcbc407aa5ad37a933b7fe30/25" width="25"
-               height="25" alt="">
+          <img class="avatar" [ngSrc]="getAvatarUrl(entry)" width="25px"
+               height="25px" alt="">
           {{ entry.username }}
         </td>
         <td class="historyPlayer">{{ entry.punishedBy }}</td>
diff --git a/frontend/src/app/bans/history/history.component.ts b/frontend/src/app/bans/history/history.component.ts
index e58e7c5..62a9a53 100644
--- a/frontend/src/app/bans/history/history.component.ts
+++ b/frontend/src/app/bans/history/history.component.ts
@@ -89,4 +89,9 @@ export class HistoryComponent implements OnInit, OnChanges {
       hour12: false
     });
   }
+
+  public getAvatarUrl(entry: PunishmentHistoryInner): string {
+    let uuid = entry.uuid.replace('-', '');
+    return `https://crafatar.com/avatars/${uuid}?size=25&overlay`;
+  }
 }
diff --git a/frontend/src/app/team/team.component.html b/frontend/src/app/team/team.component.html
index 38ea691..5a81a87 100644
--- a/frontend/src/app/team/team.component.html
+++ b/frontend/src/app/team/team.component.html
@@ -12,16 +12,16 @@
     <section class="darkmodeSection">
       <div class="container teamContainer">
         <h2 class="sectionTitle">Management</h2>
-        <div *ngFor="let members of getTeamMembers('owner') | async" class="member">
-          <img ngSrc="https://crafatar.com/avatars/{{members.uuid.replace('-', '')}}?overlay"
-               alt="{{members.name}}'s Minecraft skin" height="160" width="160" style="width: 160px;">
-          <h2>{{ members.name }}</h2>
+        <div *ngFor="let member of getTeamMembers('owner') | async" class="member">
+          <img [ngSrc]="getAvatarUrl(member)" alt="{{member.name}}'s Minecraft skin"
+               height="160" width="160" style="width: 160px;">
+          <h2>{{ member.name }}</h2>
           <p>Owner</p>
         </div>
-        <div *ngFor="let members of getTeamMembers('manager') | async" class="member">
-          <img ngSrc="https://crafatar.com/avatars/{{members.uuid.replace('-', '')}}?overlay"
-               alt="{{members.name}}'s Minecraft skin" height="160" width="160" style="width: 160px;">
-          <h2>{{ members.name }}</h2>
+        <div *ngFor="let member of getTeamMembers('manager') | async" class="member">
+          <img [ngSrc]="getAvatarUrl(member)" alt="{{member.name}}'s Minecraft skin"
+               height="160" width="160" style="width: 160px;">
+          <h2>{{ member.name }}</h2>
           <p>Manager</p>
         </div>
       </div>
@@ -29,10 +29,10 @@
     <section class="darkmodeSectionThree">
       <div class="container teamContainer">
         <h2 class="sectionTitle">Admins</h2>
-        <div *ngFor="let members of getTeamMembers('admin') | async" class="member">
-          <img ngSrc="https://crafatar.com/avatars/{{members.uuid.replace('-', '')}}?overlay"
-               alt="{{members.name}}'s Minecraft skin" height="160" width="160" style="width: 160px;">
-          <h2>{{ members.name }}</h2>
+        <div *ngFor="let member of getTeamMembers('admin') | async" class="member">
+          <img [ngSrc]="getAvatarUrl(member)" alt="{{member.name}}'s Minecraft skin"
+               height="160" width="160" style="width: 160px;">
+          <h2>{{ member.name }}</h2>
           <p>Admin</p>
         </div>
       </div>
@@ -40,10 +40,10 @@
     <section class="darkmodeSection">
       <div class="container teamContainer">
         <h2 class="sectionTitle">Head Moderators</h2>
-        <div *ngFor="let members of getTeamMembers('headmod') | async" class="member">
-          <img ngSrc="https://crafatar.com/avatars/{{members.uuid.replace('-', '')}}?overlay"
-               alt="{{members.name}}'s Minecraft skin" height="160" width="160" style="width: 160px;">
-          <h2>{{ members.name }}</h2>
+        <div *ngFor="let member of getTeamMembers('headmod') | async" class="member">
+          <img [ngSrc]="getAvatarUrl(member)" alt="{{member.name}}'s Minecraft skin"
+               height="160" width="160" style="width: 160px;">
+          <h2>{{ member.name }}</h2>
           <p>Admin</p>
         </div>
       </div>
@@ -51,20 +51,20 @@
     <section class="darkmodeSectionThree">
       <div class="container teamContainer">
         <h2 class="sectionTitle">Moderators</h2>
-        <div *ngFor="let members of getTeamMembers('moderator') | async" class="member">
-          <img ngSrc="https://crafatar.com/avatars/{{members.uuid.replace('-', '')}}?overlay"
-               alt="{{members.name}}'s Minecraft skin" height="160" width="160" style="width: 160px;">
-          <h2>{{ members.name }}</h2>
+        <div *ngFor="let member of getTeamMembers('moderator') | async" class="member">
+          <img [ngSrc]="getAvatarUrl(member)" alt="{{member.name}}'s Minecraft skin"
+               height="160" width="160" style="width: 160px;">
+          <h2>{{ member.name }}</h2>
         </div>
       </div>
     </section>
     <section *ngIf="(getTeamMembers('trainee') | async)?.length  ?? 0 > 0" class="darkmodeSection">
       <div class="container teamContainer">
         <h2 class="sectionTitle">Trainees</h2>
-        <div *ngFor="let members of getTeamMembers('trainee') | async" class="member">
-          <img ngSrc="https://crafatar.com/avatars/{{members.uuid.replace('-', '')}}?overlay"
-               alt="{{members.name}}'s Minecraft skin" height="160" width="160" style="width: 160px;">
-          <h2>{{ members.name }}</h2>
+        <div *ngFor="let member of getTeamMembers('trainee') | async" class="member">
+          <img [ngSrc]="getAvatarUrl(member)" alt="{{member.name}}'s Minecraft skin"
+               height="160" width="160" style="width: 160px;">
+          <h2>{{ member.name }}</h2>
         </div>
       </div>
     </section>
diff --git a/frontend/src/app/team/team.component.ts b/frontend/src/app/team/team.component.ts
index 4203e83..42de9e5 100644
--- a/frontend/src/app/team/team.component.ts
+++ b/frontend/src/app/team/team.component.ts
@@ -44,4 +44,9 @@ export class TeamComponent {
       index === self.findIndex((p) => p.uuid === player.uuid)
     );
   }
+
+  public getAvatarUrl(entry: Player): string {
+    let uuid = entry.uuid.replace('-', '');
+    return `https://crafatar.com/avatars/${uuid}?overlay`;
+  }
 }