diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index 268d1880232..90f5e159535 100755
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -26,9 +26,9 @@ $backends = OC_Mount_Config::getBackends();
 // Remove local storage
 unset($backends['\OC\Files\Storage\Local']);
 $tmpl = new OCP\Template('files_external', 'settings');
-$tmpl->assign('isAdminPage', false, false);
+$tmpl->assign('isAdminPage', false);
 $tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints());
 $tmpl->assign('certs', OC_Mount_Config::getCertificates());
-$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(), false);
+$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies());
 $tmpl->assign('backends', $backends);
 return $tmpl->fetchPage();
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index cd0bfa99585..1a39affe2e6 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -27,11 +27,11 @@ OCP\Util::addscript('3rdparty', 'chosen/chosen.jquery.min');
 OCP\Util::addStyle('files_external', 'settings');
 OCP\Util::addStyle('3rdparty', 'chosen/chosen');
 $tmpl = new OCP\Template('files_external', 'settings');
-$tmpl->assign('isAdminPage', true, false);
+$tmpl->assign('isAdminPage', true);
 $tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints());
 $tmpl->assign('backends', OC_Mount_Config::getBackends());
 $tmpl->assign('groups', OC_Group::getGroups());
 $tmpl->assign('users', OCP\User::getUsers());
-$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(), false);
+$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies());
 $tmpl->assign('allowUserMounting', OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes'));
 return $tmpl->fetchPage();
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 76d691eedb2..76d3db1404f 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -1,44 +1,44 @@
 <form id="files_external">
 	<fieldset class="personalblock">
-	<legend><strong><?php echo $l->t('External Storage'); ?></strong></legend>
-		<?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) echo ''.$_['dependencies'].''; ?>
-		<table id="externalStorage" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
+	<legend><strong><?php p($l->t('External Storage')); ?></strong></legend>
+		<?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) print_unescaped(''.$_['dependencies'].''); ?>
+		<table id="externalStorage" data-admin='<?php print_unescaped(json_encode($_['isAdminPage'])); ?>'>
 			<thead>
 				<tr>
 					<th></th>
-					<th><?php echo $l->t('Folder name'); ?></th>
-					<th><?php echo $l->t('External storage'); ?></th>
-					<th><?php echo $l->t('Configuration'); ?></th>
-					<!--<th><?php echo $l->t('Options'); ?></th> -->
-					<?php if ($_['isAdminPage']) echo '<th>'.$l->t('Applicable').'</th>'; ?>
+					<th><?php p($l->t('Folder name')); ?></th>
+					<th><?php p($l->t('External storage')); ?></th>
+					<th><?php p($l->t('Configuration')); ?></th>
+					<!--<th><?php p($l->t('Options')); ?></th> -->
+					<?php if ($_['isAdminPage']) print_unescaped('<th>'.OC_Util::sanitizeHTML($l->t('Applicable')).'</th>'); ?>
 					<th>&nbsp;</th>
 				</tr>
 			</thead>
 			<tbody width="100%">
 			<?php $_['mounts'] = array_merge($_['mounts'], array('' => array())); ?>
 			<?php foreach ($_['mounts'] as $mountPoint => $mount): ?>
-				<tr <?php echo ($mountPoint != '') ? 'class="'.$mount['class'].'"' : 'id="addMountPoint"'; ?>>
+				<tr <?php print_unescaped(($mountPoint != '') ? 'class="'.OC_Util::sanitizeHTML($mount['class']).'"' : 'id="addMountPoint"'); ?>>
 					<td class="status">
 					<?php if (isset($mount['status'])): ?>
-						<span class="<?php echo ($mount['status']) ? 'success' : 'error'; ?>"></span>
+						<span class="<?php p(($mount['status']) ? 'success' : 'error'); ?>"></span>
 					<?php endif; ?>
 					</td>
 					<td class="mountPoint"><input type="text" name="mountPoint"
 												  value="<?php p($mountPoint); ?>"
-												  placeholder="<?php echo $l->t('Folder name'); ?>" /></td>
+												  placeholder="<?php p($l->t('Folder name')); ?>" /></td>
 					<?php if ($mountPoint == ''): ?>
 						<td class="backend">
-							<select id="selectBackend" data-configurations='<?php echo json_encode($_['backends']); ?>'>
+							<select id="selectBackend" data-configurations='<?php print_unescaped(json_encode($_['backends'])); ?>'>
 								<option value="" disabled selected
-										style="display:none;"><?php echo $l->t('Add storage'); ?></option>
+										style="display:none;"><?php p($l->t('Add storage')); ?></option>
 								<?php foreach ($_['backends'] as $class => $backend): ?>
-									<option value="<?php echo $class; ?>"><?php echo $backend['backend']; ?></option>
+									<option value="<?php p($class); ?>"><?php p($backend['backend']); ?></option>
 								<?php endforeach; ?>
 							</select>
 						</td>
 					<?php else: ?>
 						<td class="backend"
-							data-class="<?php echo $mount['class']; ?>"><?php echo $mount['backend']; ?></td>
+							data-class="<?php p($mount['class']); ?>"><?php p($mount['backend']); ?></td>
 					<?php endif; ?>
 					<td class ="configuration" width="100%">
 						<?php if (isset($mount['configuration'])): ?>
@@ -47,29 +47,29 @@
 									<?php $placeholder = $_['backends'][$mount['class']]['configuration'][$parameter]; ?>
 									<?php if (strpos($placeholder, '*') !== false): ?>
 										<input type="password"
-											   data-parameter="<?php echo $parameter; ?>"
-											   value="<?php echo $value; ?>"
-											   placeholder="<?php echo substr($placeholder, 1); ?>" />
+											   data-parameter="<?php p($parameter); ?>"
+											   value="<?php p($value); ?>"
+											   placeholder="<?php p(substr($placeholder, 1)); ?>" />
 									<?php elseif (strpos($placeholder, '!') !== false): ?>
 										<label><input type="checkbox"
-													  data-parameter="<?php echo $parameter; ?>"
+													  data-parameter="<?php p($parameter); ?>"
 													  <?php if ($value == 'true'): ?> checked="checked"<?php endif; ?>
-													  /><?php echo substr($placeholder, 1); ?></label>
+													  /><?php p(substr($placeholder, 1)); ?></label>
 									<?php elseif (strpos($placeholder, '&') !== false): ?>
 										<input type="text"
 											   class="optional"
-											   data-parameter="<?php echo $parameter; ?>"
-											   value="<?php echo $value; ?>"
-											   placeholder="<?php echo substr($placeholder, 5); ?>" />
+											   data-parameter="<?php p($parameter); ?>"
+											   value="<?php p($value); ?>"
+											   placeholder="<?php p(substr($placeholder, 5)); ?>" />
 									<?php elseif (strpos($placeholder, '#') !== false): ?>
 										<input type="hidden"
-											   data-parameter="<?php echo $parameter; ?>"
-											   value="<?php echo $value; ?>" />
+											   data-parameter="<?php p($parameter); ?>"
+											   value="<?php p($value); ?>" />
 									<?php else: ?>
 										<input type="text"
-											   data-parameter="<?php echo $parameter; ?>"
-											   value="<?php echo $value; ?>"
-											   placeholder="<?php echo $placeholder; ?>" />
+											   data-parameter="<?php p($parameter); ?>"
+											   value="<?php p($value); ?>"
+											   placeholder="<?php p($placeholder); ?>" />
 									<?php endif; ?>
 								<?php endif; ?>
 							<?php endforeach; ?>
@@ -82,27 +82,27 @@
 					<td class="applicable"
 						align="right"
 						data-applicable-groups='<?php if (isset($mount['applicable']['groups']))
-														echo json_encode($mount['applicable']['groups']); ?>'
+														print_unescaped(json_encode($mount['applicable']['groups'])); ?>'
 						data-applicable-users='<?php if (isset($mount['applicable']['users']))
-														echo json_encode($mount['applicable']['users']); ?>'>
+														print_unescaped(json_encode($mount['applicable']['users'])); ?>'>
 							<select class="chzn-select"
 									multiple style="width:20em;"
-									data-placeholder="<?php echo $l->t('None set'); ?>">
-								<option value="all" <?php if (isset($mount['applicable']['users']) && in_array('all', $mount['applicable']['users'])) echo 'selected="selected"';?> ><?php echo $l->t('All Users'); ?></option>
-								<optgroup label="<?php echo $l->t('Groups'); ?>">
+									data-placeholder="<?php p($l->t('None set')); ?>">
+								<option value="all" <?php if (isset($mount['applicable']['users']) && in_array('all', $mount['applicable']['users'])) print_unescaped('selected="selected"');?> ><?php p($l->t('All Users')); ?></option>
+								<optgroup label="<?php p($l->t('Groups')); ?>">
 								<?php foreach ($_['groups'] as $group): ?>
-									<option value="<?php echo $group; ?>(group)"
+									<option value="<?php p($group); ?>(group)"
 									<?php if (isset($mount['applicable']['groups']) && in_array($group, $mount['applicable']['groups'])): ?>
 											selected="selected"
-									<?php endif; ?>><?php echo $group; ?></option>
+									<?php endif; ?>><?php p($group); ?></option>
 								<?php endforeach; ?>
 								</optgroup>
-								<optgroup label="<?php echo $l->t('Users'); ?>">
+								<optgroup label="<?php p($l->t('Users')); ?>">
 								<?php foreach ($_['users'] as $user): ?>
-									<option value="<?php echo $user; ?>"
+									<option value="<?php p($user); ?>"
 									<?php if (isset($mount['applicable']['users']) && in_array($user, $mount['applicable']['users'])): ?>
 											selected="selected"
-									<?php endif; ?>><?php echo $user; ?></option>
+									<?php endif; ?>><?php p($user); ?></option>
 								<?php endforeach; ?>
 								</optgroup>
 							</select>
@@ -110,10 +110,10 @@
 					<?php endif; ?>
 					<td <?php if ($mountPoint != ''): ?>class="remove"
 						<?php else: ?>style="visibility:hidden;"
-						<?php endif ?>><img alt="<?php echo $l->t('Delete'); ?>"
-											title="<?php echo $l->t('Delete'); ?>"
+						<?php endif ?>><img alt="<?php p($l->t('Delete')); ?>"
+											title="<?php p($l->t('Delete')); ?>"
 											class="svg action"
-											src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
+											src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>" /></td>
 				</tr>
 			<?php endforeach; ?>
 			</tbody>
@@ -125,9 +125,9 @@
 			<input type="checkbox"
 				   name="allowUserMounting"
 				   id="allowUserMounting"
-				   value="1" <?php if ($_['allowUserMounting'] == 'yes') echo ' checked="checked"'; ?> />
-			<label for="allowUserMounting"><?php echo $l->t('Enable User External Storage'); ?></label><br/>
-			<em><?php echo $l->t('Allow users to mount their own external storage'); ?></em>
+				   value="1" <?php if ($_['allowUserMounting'] == 'yes') print_unescaped(' checked="checked"'); ?> />
+			<label for="allowUserMounting"><?php p($l->t('Enable User External Storage')); ?></label><br/>
+			<em><?php p($l->t('Allow users to mount their own external storage')); ?></em>
 		<?php endif; ?>
 	</fieldset>
 </form>
@@ -136,27 +136,27 @@
 <form id="files_external"
 	  method="post"
 	  enctype="multipart/form-data"
-	  action="<?php echo OCP\Util::linkTo('files_external', 'ajax/addRootCertificate.php'); ?>">
+	  action="<?php p(OCP\Util::linkTo('files_external', 'ajax/addRootCertificate.php')); ?>">
 <fieldset class="personalblock">
-		<legend><strong><?php echo $l->t('SSL root certificates');?></strong></legend>
-		<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
+		<legend><strong><?php p($l->t('SSL root certificates'));?></strong></legend>
+		<table id="sslCertificate" data-admin='<?php print_unescaped(json_encode($_['isAdminPage'])); ?>'>
 			<tbody width="100%">
 			<?php foreach ($_['certs'] as $rootCert): ?>
-			<tr id="<?php echo $rootCert ?>">
-			<td class="rootCert"><?php echo $rootCert ?></td>
+			<tr id="<?php p($rootCert) ?>">
+			<td class="rootCert"><?php p($rootCert) ?></td>
 			<td <?php if ($rootCert != ''): ?>class="remove"
 				<?php else: ?>style="visibility:hidden;"
-				<?php endif; ?>><img alt="<?php echo $l->t('Delete'); ?>"
-									 title="<?php echo $l->t('Delete'); ?>"
+				<?php endif; ?>><img alt="<?php p($l->t('Delete')); ?>"
+									 title="<?php p($l->t('Delete')); ?>"
 									 class="svg action"
-									 src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
+									 src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>" /></td>
 			</tr>
 			<?php endforeach; ?>
 			</tbody>
 		</table>
-		<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken']; ?>">
+		<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']); ?>">
 		<input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;">
-		<input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />
+		<input type="submit" name="cert_import" value="<?php p($l->t('Import Root Certificate')); ?>" />
 </fieldset>
 </form>
 <?php endif; ?>