diff --git a/phpBB/adm/style/avatar.html b/phpBB/adm/style/avatar.html
index 902799b0625..a9f60cfab98 100644
--- a/phpBB/adm/style/avatar.html
+++ b/phpBB/adm/style/avatar.html
@@ -8,10 +8,10 @@
 	{% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %}
 	{% set color_class = not(avatar_data.id starts with 'g') ? color_classes[avatar_data.id % 5] : 'avatar-color-default' %}
 	{% if avatar_link %}<a href="{{ avatar_link }}" class="avatar">{% endif %}
-	<div class="avatar-placeholder {{ color_class }}">
+	<span class="avatar-placeholder {{ color_class }}">
 		{% set username = username ?: avatar_data.username %}
 		{% set initials = username|striptags|trim(' -+_[]', 'left')|slice(0, 1)|upper %}
-		<div class="avatar-initials">{% if initials %}{{ initials }}{% else %}{{ Icon('font', 'user', '', true) }}{% endif %}</div>
-	</div>
+		<span class="avatar-initials">{% if initials %}{{ initials }}{% else %}{{ Icon('font', 'user', '', true) }}{% endif %}</span>
+	</span>
 	{% if avatar_link %}</a>{% endif %}
 {% endif %}
diff --git a/phpBB/styles/prosilver/template/avatar.html b/phpBB/styles/prosilver/template/avatar.html
index 902799b0625..a9f60cfab98 100644
--- a/phpBB/styles/prosilver/template/avatar.html
+++ b/phpBB/styles/prosilver/template/avatar.html
@@ -8,10 +8,10 @@
 	{% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %}
 	{% set color_class = not(avatar_data.id starts with 'g') ? color_classes[avatar_data.id % 5] : 'avatar-color-default' %}
 	{% if avatar_link %}<a href="{{ avatar_link }}" class="avatar">{% endif %}
-	<div class="avatar-placeholder {{ color_class }}">
+	<span class="avatar-placeholder {{ color_class }}">
 		{% set username = username ?: avatar_data.username %}
 		{% set initials = username|striptags|trim(' -+_[]', 'left')|slice(0, 1)|upper %}
-		<div class="avatar-initials">{% if initials %}{{ initials }}{% else %}{{ Icon('font', 'user', '', true) }}{% endif %}</div>
-	</div>
+		<span class="avatar-initials">{% if initials %}{{ initials }}{% else %}{{ Icon('font', 'user', '', true) }}{% endif %}</span>
+	</span>
 	{% if avatar_link %}</a>{% endif %}
 {% endif %}
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index fb68cdeae0f..ea251f20219 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -1708,7 +1708,7 @@ protected static function get_logged_in_user()
 		$is_logged_in = strpos($crawler->filter('div[class="navbar"]')->text(), 'Login') === false;
 		if ($is_logged_in)
 		{
-			$username_logged_in = $crawler->filter('li[id="username_logged_in"] > div > a > span:not(.avatar)')->text();
+			$username_logged_in = $crawler->filter('li[id="username_logged_in"] > div > a > span:not(.avatar):not(.avatar-placeholder)')->text();
 		}
 		return $username_logged_in;
 	}