diff --git a/mclogalyzer/mclogalyzer.py b/mclogalyzer/mclogalyzer.py
index 4d4e6a7..32aab6b 100755
--- a/mclogalyzer/mclogalyzer.py
+++ b/mclogalyzer/mclogalyzer.py
@@ -32,6 +32,7 @@
 REGEX_IP = "(\d+)\.(\d+)\.(\d+)\.(\d+)"
 
 REGEX_LOGIN_USERNAME = re.compile("\[Server thread\/INFO\]: ([^]]+)\[")
+REGEX_UUID_USERNAME = re.compile("UUID of player ([^ ]+) is ([^ ]+)")
 REGEX_LOGOUT_USERNAME = re.compile("\[Server thread\/INFO\]: ([^ ]+) lost connection")
 REGEX_LOGOUT_USERNAME2 = re.compile(
     "\[Server thread\/INFO\]:.*GameProfile.*name='?([^ ,']+)'?.* lost connection")
@@ -99,6 +100,7 @@ def capitalize_first(str):
 class UserStats:
     def __init__(self, username=""):
         self._username = username
+        self._uuid = None
         self._logins = 0
 
         self._active_days = set()
@@ -298,6 +300,17 @@ def grep_login_username(line):
     return username.decode("ascii", "ignore").encode("ascii", "ignore")
 
 
+
+def grep_uuid(line):
+    search = REGEX_UUID_USERNAME.search(line)
+    if not search:
+        return ""
+    username = search.group(1).lstrip().rstrip()
+    uuid = search.group(2).lstrip().rstrip()
+    return username, uuid
+
+
+
 def grep_logout_username(line):
     search = REGEX_LOGOUT_USERNAME.search(line)
     if not search:
@@ -443,6 +456,14 @@ def parse_logs(logdir, since=None, whitelist_users=None):
                         achievement_user = users[achievement_username]
                         achievement_user._achievement_count += 1
                         achievement_user._achievements.append(achievement)
+            elif "UUID of player" in line:
+                uuid_username, uuid = grep_uuid(line)
+                if not uuid_username or uuid_username.startswith("/"):
+                    continue
+                if uuid_username not in users:
+                    continue
+                user = users[uuid_username]
+                user._uuid = uuid
             else:
                 death_username, death_type = grep_death(line)
                 death_time = grep_log_datetime(today, line)
diff --git a/mclogalyzer/template.html b/mclogalyzer/template.html
index b2c666e..aca248f 100644
--- a/mclogalyzer/template.html
+++ b/mclogalyzer/template.html
@@ -178,7 +178,7 @@ <h4>Columns</h4>
 								<td class="c-place"></td>
 								<td>
 									<a class="js-link" data-page="page-players-{{ user.username }}" href="#players-{{ user.username }}">
-										<img class="avatar" src="http://avatars.mapcrafter.org/head/{{ user.username }}/4" />{{ user.username }}
+										<img class="avatar" src="https://crafatar.com/avatars/{{ user._uuid }}?size=40" />{{ user.username }}
 									</a>
 								</td>
 								<td class="col c-time-played">{{ user.time }}</td>
@@ -241,7 +241,7 @@ <h4>Columns</h4>
 			{% for user in users %}
 			<div id="page-players-{{ user.username }}" class="page page-player row">
 				<div class="col-md-8">
-					<h4>Player Statistics for {{user.username }}</h4>
+					<h4>Player Statistics for {{user.username }} ({{user._uuid}})</h4>
 					<table class="table table-striped table-bordered">
 						<tr>
 							<th>Time Played:</th>
@@ -327,7 +327,7 @@ <h4>Player Statistics for {{user.username }}</h4>
 					</table>
 				</div>
 				<div class="col-md-4" style="text-align: center">
-					<img style="margin-top: 100px" src="http://avatars.mapcrafter.org/body/{{ user.username }}/8" />
+					<img style="margin-top: 100px" src="https://crafatar.com/renders/body/{{ user._uuid }}" />
 				</div>
 			</div>
 			{% endfor %}