diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index d1d7ecb4be..2ab64c65e8 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -307,6 +307,9 @@ $(document).ready(function() {
 	}
 
 	app.load();
-	templates.cache['500'] = $('.tpl-500').html();
+
+	$('[data-template]').each(function() {
+		templates.cache[$(this).attr('data-template')] = $(this).html();
+	});
 
 });
\ No newline at end of file
diff --git a/src/views/500.tpl b/src/views/500.tpl
index 6408fbb79d..537cbac136 100644
--- a/src/views/500.tpl
+++ b/src/views/500.tpl
@@ -1,3 +1,4 @@
+<script type="text/tpl" data-template="500">
 <div class="alert alert-danger">
 	<strong>[[global:500.title]]</strong>
 	<p>[[global:500.message]]</p>
@@ -5,3 +6,4 @@
 	<!-- IF error --><p>{error}</p><!-- ENDIF error -->
 
 </div>
+</script>
\ No newline at end of file