diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 264b0df87d..21512fc016 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -127,23 +127,33 @@ var ajaxify = {};
 		$('#footer, #content').removeClass('hide').addClass('ajaxifying');
 	};
 
+	/*
+	* this is complete hax and needs to be looked at. (fixing this is out of scope for what I'm currently refactoring)
+	*   -- psychobunny
+	*/
 	ajaxify.getTemplateMapping = function(url) {
 		var tpl_url = templates.get_custom_map(url.split('?')[0]);
 
 		if (tpl_url == false && !templates[url]) {
-			// todo: regex
 			if (url === '' || url === '/') {
 				tpl_url = 'home';
 			} else if (url === 'admin' || url === 'admin/') {
 				tpl_url = 'admin/index';
 			} else {
-				tpl_url = url.split('/')[0].split('?')[0];
+				tpl_url = url.split('/');
+
+				if (tpl_url[0] === 'admin') {
+					tpl_url = tpl_url[0] + '/' + tpl_url[1]; 
+				} else {
+					tpl_url = tpl_url[0].split('?')[0];
+				}
 			}
 
 		} else if (templates[url]) {
 			tpl_url = url;
 		}
 
+		console.log(tpl_url);
 		return tpl_url;
 	}
 
diff --git a/public/src/templates.js b/public/src/templates.js
index f538a048f6..f82771107b 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -69,11 +69,17 @@
 	templates.getTemplateNameFromUrl = function(url) {
 		var parts = url.split('?')[0].split('/');
 
-		for (var i = 0; i < parts.length; ++i) {
-			if (templates.is_available(parts[i])) {
-				return parts[i];
+		if (parts[0] === 'admin') {
+			return parts = parts[0] + '/' + parts[1]; 
+		} else {
+			for (var i = 0; i < parts.length; ++i) {
+				if (templates.is_available(parts[i])) {
+					return parts[i];
+				}
 			}
 		}
+
+		
 		return '';
 	};
 
@@ -112,6 +118,8 @@
 			tpl_url = templates.getTemplateNameFromUrl(api_url);
 		}
 
+		console.log(tpl_url);
+
 		var template_data = null;
 
 		if (!templates[tpl_url]) {