diff --git a/src/etc/inc/unbound.inc b/src/etc/inc/unbound.inc
index a786c11e1..cdfa44b26 100644
--- a/src/etc/inc/unbound.inc
+++ b/src/etc/inc/unbound.inc
@@ -412,13 +412,13 @@ function do_as_unbound_user($cmd) {
             mwexec("/usr/sbin/unbound -c {$g['unbound_chroot_path']}/unbound.conf");
             break;
         case "stop":
-            mwexec("echo '/usr/sbin/unbound-control stop' | /usr/bin/su -m unbound", true);
+            mwexec("chroot -u unbound -g unbound / /usr/sbin/unbound-control stop", true);
             break;
         case "unbound-anchor":
-            mwexec("echo '/usr/sbin/unbound-anchor -a {$g['unbound_chroot_path']}/root.key' | /usr/bin/su -m unbound", true);
+            mwexec("chroot -u unbound -g unbound / /usr/sbin/unbound-anchor -a {$g['unbound_chroot_path']}/root.key", true);
             break;
         case "unbound-control-setup":
-            mwexec("echo '/usr/sbin/unbound-control-setup -d {$g['unbound_chroot_path']}' | /usr/bin/su -m unbound", true);
+            mwexec("chroot -u unbound -g unbound / /usr/sbin/unbound-control-setup -d {$g['unbound_chroot_path']}", true);
             break;
         default:
             break;
diff --git a/src/www/services_unbound.php b/src/www/services_unbound.php
index 8ec4b3c58..4aa0a6a3f 100644
--- a/src/www/services_unbound.php
+++ b/src/www/services_unbound.php
@@ -386,7 +386,7 @@ function show_advanced_dns() {
 										<table border="0" cellspacing="0" cellpadding="1" summary="add">
 											<tr>
 												<td width="17"></td>
-												<td valign="middle"><a href="services_unbound_host_edit.php" class="btn btn-default btn-xs"><span class="glypicon glyphicon-plus"></span></a></td>
+												<td valign="middle"><a href="services_unbound_host_edit.php" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a></td>
 											</tr>
 										</table>
 									</td>
@@ -410,8 +410,8 @@ function show_advanced_dns() {
 									<td valign="middle" class="list nowrap">
 										<table border="0" cellspacing="0" cellpadding="1" summary="icons">
 											<tr>
-												<td valign="middle"><a href="services_unbound_host_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glypicon glyphicon-pencil"></span></a></td>
-												<td><a href="services_unbound.php?type=host&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')" class="btn btn-default btn-xs"><span class="glypicon glyphicon-remove"></span></a></td>
+												<td valign="middle"><a href="services_unbound_host_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a></td>
+												<td><a href="services_unbound.php?type=host&amp;act=del&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this host?");?>')" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a></td>
 											</tr>
 										</table>
 								</tr>
@@ -450,7 +450,7 @@ function show_advanced_dns() {
 										<table border="0" cellspacing="0" cellpadding="1" summary="add">
 											<tr>
 												<td width="17" height="17"></td>
-												<td><a href="services_unbound_domainoverride_edit.php" class="btn btn-default btn-xs"><span class="glypicon glyphicon-plus"></span></a></td>
+												<td><a href="services_unbound_domainoverride_edit.php" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a></td>
 											</tr>
 										</table>
 									</td>
@@ -472,8 +472,8 @@ function show_advanced_dns() {
 									<td valign="middle" class="list nowrap">
 										<table border="0" cellspacing="0" cellpadding="1" summary="icons">
 											<tr>
-												<td valign="middle"><a href="services_unbound_domainoverride_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glypicon glyphicon-pencil"></span></a></td>
-												<td valign="middle"><a href="services_unbound.php?act=del&amp;type=doverride&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')" class="btn btn-default btn-xs"><span class="glypicon glyphicon-remove"></span></a></td>
+												<td valign="middle"><a href="services_unbound_domainoverride_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a></td>
+												<td valign="middle"><a href="services_unbound.php?act=del&amp;type=doverride&amp;id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this domain override?");?>')" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></a></td>
 											</tr>
 										</table>
 									</td>