diff --git a/files/assets/js/sort_table.js b/files/assets/js/sort_table.js
index 60c5b80d8..5ea6de30b 100644
--- a/files/assets/js/sort_table.js
+++ b/files/assets/js/sort_table.js
@@ -8,7 +8,14 @@ function sort_table(n) {
 		const ele = rows[i];
 		let x = rows[i].getElementsByTagName("TD")[n];
 		x = x.getElementsByTagName('a')[0] || x;
-		const attr = x.dataset.time ? parseInt(x.dataset.time) : parseInt(x.innerHTML.replace(/,/g, ''));
+		var attr;
+		if ('sortKey' in x.dataset) {
+			attr = x.dataset.sortKey;
+		} else if ('time' in x.dataset) {
+			attr = parseInt(x.dataset.time);
+		} else {
+			attr = parseInt(x.innerHTML.replace(/,/g, ''));
+		}
 		items.push({ ele, attr });
 	}
 	if (sortAscending[n]) {
diff --git a/files/templates/marseys.html b/files/templates/marseys.html
index fb41ffe90..ad562455c 100644
--- a/files/templates/marseys.html
+++ b/files/templates/marseys.html
@@ -14,7 +14,7 @@
 		{% endif %}
 		<th onclick="sort_table(5)">Added on</th>
 		{% if FEATURES['ASSET_SUBMISSIONS'] %}
-		<th>Original File</th>
+			<th>Original File</th>
 		{% endif %}
 	</tr>
 </thead>
@@ -22,14 +22,14 @@
 {% for marsey in marseys %}
 <tr>
 	<td>{{loop.index}}</td>
-	<td>{{marsey.name}}</td>
+	<td data-sort-key="{{marsey.name}}">{{marsey.name}}</td>
 	<td><img class="marsey" loading="lazy" data-bs-toggle="tooltip" alt=":#{{marsey.name}}:" title=":{{marsey.name}}:" src="/e/{{marsey.name}}.webp"></td>
 	<td>{{marsey.count}}</td>
 	{% if FEATURES['ASSET_SUBMISSIONS'] %}
 	{% set user = marsey.user %}
-	<td>{% include "user_in_table.html" %}</td>
+	<td data-sort-key="{{user.username}}">{% include "user_in_table.html" %}</td>
 	{% endif %}
-	<td {% if marsey.created_utc != None %}data-time="{{marsey.created_utc}}"{% endif %}></td>
+	<td data-sort-key="{{marsey.created_utc}}" {% if marsey.created_utc != None %}data-time="{{marsey.created_utc}}"{% endif %}></td>
 	{% if FEATURES['ASSET_SUBMISSIONS'] %}
 	<td>
 		{% if marsey.og %}