diff --git a/modules/data/webadmin/files/webadmin.css b/modules/data/webadmin/files/webadmin.css
index fd832aa0..772f01cc 100644
--- a/modules/data/webadmin/files/webadmin.css
+++ b/modules/data/webadmin/files/webadmin.css
@@ -6,3 +6,10 @@
 .encoding-settings {
 	width: 500px;
 }
+
+table .sorted::after {
+	content:" ▾";
+}
+table .reverse-sorted::after {
+	content:" ▴";
+}
\ No newline at end of file
diff --git a/modules/data/webadmin/files/webadmin.js b/modules/data/webadmin/files/webadmin.js
index 4658620a..9ee4ef69 100644
--- a/modules/data/webadmin/files/webadmin.js
+++ b/modules/data/webadmin/files/webadmin.js
@@ -11,3 +11,87 @@ function floodprotection_change() {
 	}
 }
 
+function make_sortable_table(table) {
+	if (table.rows.length >= 1) { // Ensure that the table at least contains a row for the headings
+		var headings = table.rows[0].getElementsByTagName("td");
+		for (var i = 0; i < headings.length; i++) {
+			// This function acts to scope the i variable, so we can pass it off
+			// as the column_index, otherwise column_index would just be the max
+			// value of i, every single time.
+			(function (i) {
+				var heading = headings[i];
+				if (!heading.classList.contains("ignore-sort")) {
+					heading.addEventListener("click", function () { // Bind a click event to the heading
+						sort_table(this, i, table, headings);
+					});
+				}
+			})(i);
+		}
+	}
+}
+
+function sort_table(clicked_column, column_index, table, headings) {
+	for (var i = 0; i < headings.length; i++) {
+		if (headings[i] != clicked_column) {
+			headings[i].classList.remove("sorted");
+			headings[i].classList.remove("reverse-sorted");
+		}
+	}
+	var reverse = false;
+	clicked_column.classList.toggle("reverse");
+	if (clicked_column.classList.contains("sorted")) {
+		reverse = true;
+		clicked_column.classList.remove("sorted");
+		clicked_column.classList.add("reverse-sorted");
+	} else {
+		clicked_column.classList.remove("reverse-sorted");
+		clicked_column.classList.add("sorted");
+	}
+
+	// This array will contain tuples in the form [(value, row)] where value
+	// is extracted from the column to be sorted by
+	var rows_and_sortable_value = [];
+	for (var i = 1, row; row = table.rows[i]; i++) {
+		for (var j = 0, col; col = row.cells[j]; j++) {
+			// If we're at the column index we want to sort by
+			if (j === column_index) {
+				var cell = row.getElementsByTagName("td")[j];
+				var value = cell.innerHTML;
+				rows_and_sortable_value.push([value, row]);
+			}
+		}
+	}
+
+	rows_and_sortable_value.sort(function (a, b) {
+		// If both values are integers, sort by that else as strings
+		if (isInt(a[0]) && isInt(b[0])) {
+			return a[0] - b[0];
+		} else {
+			return b[0].localeCompare(a[0]);
+		}
+	});
+	if (reverse) {
+		rows_and_sortable_value.reverse();
+	}
+
+	var parent = table.rows[1].parentNode;
+	for (var i = 0; i < rows_and_sortable_value.length; i++) {
+		// Remove the existing entry for the row from the table
+		parent.removeChild(rows_and_sortable_value[i][1]);
+		// Insert at the first position, before the first child
+		parent.insertBefore(rows_and_sortable_value[i][1], parent.firstChild);
+	}
+}
+
+function isInt(value) {
+	return !isNaN(value) && (function (x) {
+		return (x | 0) === x;
+	})(parseFloat(value))
+}
+
+function make_sortable() {
+	var tables = document.querySelectorAll("table.sortable");
+	for (var i = 0; i < tables.length; i++) {
+    	make_sortable_table(tables[i]);
+	}
+}
\ No newline at end of file
diff --git a/modules/data/webadmin/tmpl/add_edit_user.tmpl b/modules/data/webadmin/tmpl/add_edit_user.tmpl
index 2f4ff370..a1c6b871 100644
--- a/modules/data/webadmin/tmpl/add_edit_user.tmpl
+++ b/modules/data/webadmin/tmpl/add_edit_user.tmpl
@@ -1,3 +1,4 @@
+<? AddRow JSLoop HREF=/modfiles/global/webadmin/webadmin.js ?>
 <? AddRow CSSLoop HREF=/modfiles/global/webadmin/webadmin.css ?>
 <? INC Header.tmpl ?>
 
@@ -126,10 +127,10 @@
 		<? IF Edit ?>
 		<div class="sectionbg">
 			<div class="sectionbody">
-				<table>
+				<table class="sortable">
 					<thead>
 					<tr>
-						<td>[<a href="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>addnetwork?user=<? VAR Username ESC=URL ?>">Add</a>]</td>
+						<td class="ignore-sort">[<a href="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>addnetwork?user=<? VAR Username ESC=URL ?>">Add</a>]</td>
 				<? IF NetworkLoop ?>
 						<td>Name</td>
 						<td>Clients</td>
@@ -353,5 +354,6 @@
 		<? ENDIF ?>
 	</div>
 </form>
+<script>make_sortable();</script>
 
 <? INC Footer.tmpl ?>
diff --git a/modules/data/webadmin/tmpl/listusers.tmpl b/modules/data/webadmin/tmpl/listusers.tmpl
index 5bdd9cf3..ce77c595 100644
--- a/modules/data/webadmin/tmpl/listusers.tmpl
+++ b/modules/data/webadmin/tmpl/listusers.tmpl
@@ -1,3 +1,5 @@
+<? AddRow JSLoop HREF=/modfiles/global/webadmin/webadmin.js ?>
+<? AddRow CSSLoop HREF=/modfiles/global/webadmin/webadmin.css ?>
 <? INC Header.tmpl ?>
 
 		<?IF !UserLoop?>
@@ -6,10 +8,10 @@
 			</div>
 		<?ELSE?>
 			<div class="toptable">
-				<table>
+				<table class="sortable">
 					<thead>
 					<tr>
-						<td>[<a href="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>adduser">Add</a>]</td>
+						<td class="ignore-sort">[<a href="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>adduser">Add</a>]</td>
 						<td>Username</td>
                         <td>Networks</td>
 						<td>Clients</td>
@@ -34,6 +36,7 @@
 					</tbody>
 				</table>
 			</div>
+			<script>make_sortable();</script>
 		<?ENDIF?>
 
 <? INC Footer.tmpl ?>