diff --git a/system/pages/team.php b/system/pages/team.php
index 202ee1bb..16b9beb4 100644
--- a/system/pages/team.php
+++ b/system/pages/team.php
@@ -56,11 +56,11 @@ foreach($groupList as $id => $group)
 			'group_name' => $group->getName(),
 			'player' => $member,
 			'outfit' => $config['team_display_outfit'] ? $config['outfit_images_url'] . '?id=' . $member->getLookType() . ($outfit_addons ? '&addons=' . $member->getLookAddons() : '') . '&head=' . $member->getLookHead() . '&body=' . $member->getLookBody() . '&legs=' . $member->getLookLegs() . '&feet=' . $member->getLookFeet() : null,
-			'status' => $member->isOnline(),
+			'status' => $config['team_display_status'] ? $member->isOnline() : null,
 			'link' => getPlayerLink($member->getName()),
-			'flag_image' => getFlagImage($member->getAccount()->getCountry()),
-			'world_name' => getWorldName($member->getWorldId()),
-			'last_login' => $lastLogin
+			'flag_image' => $config['account_country'] ? getFlagImage($member->getAccount()->getCountry()) : null,
+			'world_name' => ($config['multiworld'] || $config['team_display_world']) ? getWorldName($member->getWorldId()) : null,
+			'last_login' => $config['team_display_lastlogin'] ? $lastLogin : null
 		);	
 	}
 
diff --git a/system/templates/team.html.twig b/system/templates/team.html.twig
index b3353644..93fdbf19 100644
--- a/system/templates/team.html.twig
+++ b/system/templates/team.html.twig
@@ -52,89 +52,17 @@
 						</tr>
 
 						{% for group in groupmember|reverse %}
-							{% for member in group.members|reverse %}
-							<tr>
-								<td>{{ group.group_name }}</td>
-
-								{% if config.team_display_outfit %}
-									<td>
-										<img style="position:absolute;margin-top:{% if member.player.looktype in [75, 266, 302] %}-20px;margin-left:-0px;{% else %}-45px;margin-left:-25px;{%  endif %}" src="{{ member.outfit }}" alt="player outfit"/>
-									</td>
-								{% endif %}	
-
-								<td> 
-									{% if config.account_country %}
-										{{ member.flag_image|raw }}
-									{% endif %}		
-									{{ member.link|raw }}
-								</td>
-
-								{% if config.team_display_status %}
-								<td>
-									{% if member.status %}
-										<span style="color: green"><b>Online</b></span>
-									{% else %}
-										<span style="color: red"><b>Offline</b></span>
-									{% endif %}
-								</td>	
-								{% endif %}
-
-								{% if (config.multiworld or config.team_display_world) %}
-								<td>
-									<span><b>{{ member.world_name }}</b></span>
-								</td>
-								{% endif %}		
-
-								{% if config.team_display_lastlogin %}
-								<td>
-									{{ member.last_login }}
-								</td>
-								{% endif %}					
-							</tr>
-							{% endfor %}
-						{% endfor %}
-
-						{% elseif config.team_style == 2 %}			
-							{% for group in groupmember|reverse %}
-							<div style="text-align:center"><h2>{{ group.group_name }}</h2></div>
-
-							<table cellspacing="1" cellpadding="4" border="0" width="100%">
+							{% if group.members is not empty %}	
+								{% for member in group.members|reverse %}
 								<tr>
-									{% if config.team_display_outfit %}
-										<td width="5%"><span><b>Outfit</b></span></td>
-									{% endif %}		
+									<td>{{ group.group_name }}</td>
 
-									<td width="40%">
-										<span><b>Name</b></span>
-									</td>
-
-									{% if config.team_display_status %}
-									<td>
-										<span><b>Status</b></span>
-									</td>
-									{% endif %}
-
-									{% if (config.multiworld or config.team_display_world) %}
-									<td>
-										<span><b>World</b></span>
-									</td>
-									{% endif %}							
-
-									{% if config.team_display_lastlogin %}
-									<td>
-										<span><b>Last login</b></span>
-									</td>
-									{% endif %}
-								</tr>
-
-								{% for member in group.members %}
-								<tr>
 									{% if config.team_display_outfit %}
 										<td>
 											<img style="position:absolute;margin-top:{% if member.player.looktype in [75, 266, 302] %}-20px;margin-left:-0px;{% else %}-45px;margin-left:-25px;{%  endif %}" src="{{ member.outfit }}" alt="player outfit"/>
 										</td>
 									{% endif %}	
-									 					
+
 									<td> 
 										{% if config.account_country %}
 											{{ member.flag_image|raw }}
@@ -162,10 +90,86 @@
 									<td>
 										{{ member.last_login }}
 									</td>
-									{% endif %}	
+									{% endif %}					
 								</tr>
 								{% endfor %}
-							</table>
+							{% endif %}	
+						{% endfor %}
+
+						{% elseif config.team_style == 2 %}			
+							{% for group in groupmember|reverse %}
+								{% if group.members is not empty %}
+								<div style="text-align:center"><h2>{{ group.group_name }}</h2></div>
+
+								<table cellspacing="1" cellpadding="4" border="0" width="100%">
+									<tr>
+										{% if config.team_display_outfit %}
+											<td width="5%"><span><b>Outfit</b></span></td>
+										{% endif %}		
+
+										<td width="40%">
+											<span><b>Name</b></span>
+										</td>
+
+										{% if config.team_display_status %}
+										<td>
+											<span><b>Status</b></span>
+										</td>
+										{% endif %}
+
+										{% if (config.multiworld or config.team_display_world) %}
+										<td>
+											<span><b>World</b></span>
+										</td>
+										{% endif %}							
+
+										{% if config.team_display_lastlogin %}
+										<td>
+											<span><b>Last login</b></span>
+										</td>
+										{% endif %}
+									</tr>
+
+									{% for member in group.members %}
+									<tr>
+										{% if config.team_display_outfit %}
+											<td>
+												<img style="position:absolute;margin-top:{% if member.player.looktype in [75, 266, 302] %}-20px;margin-left:-0px;{% else %}-45px;margin-left:-25px;{%  endif %}" src="{{ member.outfit }}" alt="player outfit"/>
+											</td>
+										{% endif %}	
+										 					
+										<td> 
+											{% if config.account_country %}
+												{{ member.flag_image|raw }}
+											{% endif %}		
+											{{ member.link|raw }}
+										</td>
+
+										{% if config.team_display_status %}
+										<td>
+											{% if member.status %}
+												<span style="color: green"><b>Online</b></span>
+											{% else %}
+												<span style="color: red"><b>Offline</b></span>
+											{% endif %}
+										</td>	
+										{% endif %}
+
+										{% if (config.multiworld or config.team_display_world) %}
+										<td>
+											<span><b>{{ member.world_name }}</b></span>
+										</td>
+										{% endif %}		
+
+										{% if config.team_display_lastlogin %}
+										<td>
+											{{ member.last_login }}
+										</td>
+										{% endif %}	
+									</tr>
+									{% endfor %}
+								</table>
+								{% endif %}
 							{% endfor %}
 						{% endif %}
 					</table>