diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 5723ff9449..c89b51eba6 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -312,7 +312,7 @@
 										$array["extensions"][$i]["number_alias"] = $number_alias;
 									}
 									$array["extensions"][$i]["password"] = $password;
-									if (if_group("superadmin") || if_group("admin")) {
+									if (permission_exists('extension_accountcode')) {
 										$array["extensions"][$i]["accountcode"] = $accountcode;
 									}
 									$array["extensions"][$i]["effective_caller_id_name"] = $effective_caller_id_name;
@@ -348,7 +348,7 @@
 									if (strlen($sip_force_expires) > 0) {
 										$array["extensions"][$i]["sip_force_expires"] = $sip_force_expires;
 									}
-									if (if_group("superadmin")) {
+									if (permission_exists('extension_nibble_account')) {
 										if (strlen($nibble_account) > 0) {
 											$array["extensions"][$i]["nibble_account"] = $nibble_account;
 										}
@@ -940,7 +940,7 @@
 		echo "</tr>\n";
 	}
 
-	if (if_group("superadmin") || if_group("admin")) {
+	if (permission_exists('extension_accountcode')) {
 			echo "<tr>\n";
 			echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 			echo "    ".$text['label-accountcode']."\n";
@@ -1639,7 +1639,7 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	if (if_group("superadmin")) {
+	if (permission_exists('extension_nibble_account')) {
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 		echo "    ".$text['label-nibble_account']."\n";