diff --git a/public/src/templates.js b/public/src/templates.js
index 97c1c63b06..6ce8b0e96b 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -323,6 +323,33 @@
 				template = '';
 			}
 
+			function checkConditional(key, value) {
+				var conditional = makeConditionalRegex(key),
+					matches = template.match(conditional);
+
+				if (matches !== null) {
+					for (var i = 0, ii = matches.length; i < ii; i++) {
+						var conditionalBlock = matches[i].split(/<!-- ELSE -->/);
+
+						if (conditionalBlock[1]) {
+							// there is an else statement
+							if (!value) {
+								template = template.replace(matches[i], conditionalBlock[1].replace(/<!-- ((\IF\b)|(\bENDIF\b))([^@]*?)-->/gi, ''));
+							} else {
+								template = template.replace(matches[i], conditionalBlock[0].replace(/<!-- ((\IF\b)|(\bENDIF\b))([^@]*?)-->/gi, ''));
+							}
+						} else {
+							// regular if statement
+							if (!value) {
+								template = template.replace(matches[i], '');
+							} else {
+								template = template.replace(matches[i], matches[i].replace(/<!-- ((\IF\b)|(\bENDIF\b))([^@]*?)-->/gi, ''));
+							}
+						}
+					}
+				}
+			}
+
 			for (var d in data) {
 				if (data.hasOwnProperty(d)) {
 					if (typeof data[d] === 'undefined') {
@@ -330,6 +357,8 @@
 					} else if (data[d] === null) {
 						template = replace(namespace + d, '', template);
 					} else if (data[d].constructor == Array) {
+						checkConditional(namespace + d + '.length', data[d].length);
+
 						namespace += d + '.';
 
 						var regex = makeRegex(d),
@@ -353,33 +382,6 @@
 					} else if (data[d] instanceof Object) {
 						template = parse(data[d], d + '.', template);
 					} else {
-						function checkConditional(key, value) {
-							var conditional = makeConditionalRegex(key),
-								matches = template.match(conditional);
-
-							if (matches !== null) {
-								for (var i = 0, ii = matches.length; i < ii; i++) {
-									var conditionalBlock = matches[i].split(/<!-- ELSE -->/);
-
-									if (conditionalBlock[1]) {
-										// there is an else statement
-										if (!value) {
-											template = template.replace(matches[i], conditionalBlock[1].replace(/<!-- ((\IF\b)|(\bENDIF\b))([^@]*?)-->/gi, ''));
-										} else {
-											template = template.replace(matches[i], conditionalBlock[0].replace(/<!-- ((\IF\b)|(\bENDIF\b))([^@]*?)-->/gi, ''));
-										}
-									} else {
-										// regular if statement
-										if (!value) {
-											template = template.replace(matches[i], '');
-										} else {
-											template = template.replace(matches[i], matches[i].replace(/<!-- ((\IF\b)|(\bENDIF\b))([^@]*?)-->/gi, ''));
-										}
-									}
-								}
-							}
-						}
-
 						checkConditional(namespace + d, data[d]);
 						checkConditional('!' + namespace + d, !data[d]);
 
diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl
index 9e3dc7f839..4806594d82 100644
--- a/public/templates/admin/header.tpl
+++ b/public/templates/admin/header.tpl
@@ -112,16 +112,18 @@
 						<li><a href="{relative_path}/admin/events"><i class="fa fa-fw fa-calendar-o"></i> Events</a></li>
 					</ul>
 				</div>
+				<!-- IF authentication.length -->
 				<div class="well sidebar-nav">
 					<ul class="nav nav-list">
-						<li class="nav-header">Social Authentication</li>
-						<!-- BEGIN authentication -->
-						<li>
-							<a href="{relative_path}/admin{authentication.route}"><i class="fa fa-fw {authentication.icon}"></i> {authentication.name}</a>
-						</li>
-						<!-- END authentication -->
+							<li class="nav-header">Social Authentication</li>
+							<!-- BEGIN authentication -->
+							<li>
+								<a href="{relative_path}/admin{authentication.route}"><i class="fa fa-fw {authentication.icon}"></i> {authentication.name}</a>
+							</li>
+							<!-- END authentication -->
 					</ul>
 				</div>
+				<!-- ENDIF authentication.length -->
 				<div class="well sidebar-nav">
 					<ul class="nav nav-list">
 						<li class="nav-header">Plugins</li>