diff --git a/modules/data/webadmin/tmpl/traffic.tmpl b/modules/data/webadmin/tmpl/traffic.tmpl
index 368f09b4..81d26c5b 100644
--- a/modules/data/webadmin/tmpl/traffic.tmpl
+++ b/modules/data/webadmin/tmpl/traffic.tmpl
@@ -40,51 +40,70 @@
 	</div>
 </div>
 
-<? IF IsAdmin && TrafficLoop ?>
+<? IF IsAdmin ?>
 <div class="section">
-	<h3>Traffic</h3>
+	<h3>Total</h3>
 	<div class="sectionbg">
 		<div class="sectionbody">
 			<table>
 				<thead>
 					<tr>
-						<td>Username</td>
+						<td></td>
 						<td>In</td>
 						<td>Out</td>
 						<td>Total</td>
 					</tr>
 				</thead>
 				<tbody>
-				<? LOOP TrafficLoop SORTASC=Username ?>
-					<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
-						<td><? VAR Username ?></td>
-						<td><? VAR In ?></td>
-						<td><? VAR Out ?></td>
-						<td><? VAR Total ?></td>
-					</tr>
-					<? REM ?>Add the totals separately so that if sort is ever used they stay at the bottom
-								 By keeping them inside the loop we can figure out even/odd classes though.
-					<? ENDREM ?>
-					<? IF __LAST__ ?>
-					<tr class="<? IF __EVEN__ ?>oddrow<? ELSE ?>evenrow<? ENDIF ?>">
-						<td>User Total</td>
+					<tr class="evenrow">
+						<td>Users</td>
 						<td><? VAR UserIn TOP ?></td>
 						<td><? VAR UserOut TOP ?></td>
 						<td><? VAR UserTotal TOP ?></td>
 					</tr>
-					<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
-						<td>ZNC Total</td>
+					<tr class="oddrow">
+						<td>ZNC</td>
 						<td><? VAR ZNCIn TOP ?></td>
 						<td><? VAR ZNCOut TOP ?></td>
 						<td><? VAR ZNCTotal TOP ?></td>
 					</tr>
-					<tr class="<? IF __EVEN__ ?>oddrow<? ELSE ?>evenrow<? ENDIF ?>">
-						<td>Grand Total</td>
+					<tr class="evenrow">
+						<td>Total</td>
 						<td><? VAR AllIn TOP ?></td>
 						<td><? VAR AllOut TOP ?></td>
 						<td><? VAR AllTotal TOP ?></td>
 					</tr>
-					<? ENDIF ?>
+				</tbody>
+			</table>
+		</div>
+	</div>
+</div>
+<? ENDIF ?>
+
+<? IF IsAdmin && TrafficLoop ?>
+<div class="section">
+	<h3>Users</h3>
+	<div class="sectionbg">
+		<div class="sectionbody">
+			<table>
+				<thead>
+					<tr>
+						<td>Username</td>
+						<td>Network</td>
+						<td>In</td>
+						<td>Out</td>
+						<td>Total</td>
+					</tr>
+				</thead>
+				<tbody>
+				<? LOOP TrafficLoop ?>
+					<tr class="<? IF __EVEN__ ?>evenrow<? ELSE ?>oddrow<? ENDIF ?>">
+						<td><? VAR Username ?></td>
+						<td><? VAR Network ?></td>
+						<td><? VAR In ?></td>
+						<td><? VAR Out ?></td>
+						<td><? VAR Total ?></td>
+					</tr>
 				<? ENDLOOP ?>
 				</tbody>
 			</table>
diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index 6d6ca7ed..afc967b8 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -1475,6 +1475,17 @@ public:
 			l["In"] = CString::ToByteStr(it.second.first);
 			l["Out"] = CString::ToByteStr(it.second.second);
 			l["Total"] = CString::ToByteStr(it.second.first + it.second.second);
+
+			CZNC::TrafficStatsPair NetworkTotal;
+			CZNC::TrafficStatsMap NetworkTraffic = CZNC::Get().GetNetworkTrafficStats(it.first, NetworkTotal);
+			for (const auto& it2 : NetworkTraffic) {
+				CTemplate& l2 = Tmpl.AddRow("TrafficLoop");
+
+				l2["Network"] = it2.first;
+				l2["In"] = CString::ToByteStr(it2.second.first);
+				l2["Out"] = CString::ToByteStr(it2.second.second);
+				l2["Total"] = CString::ToByteStr(it2.second.first + it2.second.second);
+			}
 		}
 
 		Tmpl["UserIn"] = CString::ToByteStr(Users.first);