diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index ca4ff9a093..81e0529335 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -585,7 +585,9 @@ require_once "resources/require.php";
 	echo "				<td class='vtable' nowrap='nowrap'>".$text['label-display_name']."</td>\n";
 	echo "				<td class='vtable' nowrap='nowrap'>".$text['label-user_id']."</td>\n";
 	echo "				<td class='vtable' nowrap='nowrap'>".$text['label-auth_id']."</td>\n";
-	echo "				<td class='vtable' nowrap='nowrap'>".$text['label-password']."</td>\n";
+	if (permission_exists('device_line_password')) {
+		echo "				<td class='vtable' nowrap='nowrap'>".$text['label-password']."</td>\n";
+	}
 	echo "				<td class='vtable' nowrap='nowrap'>".$text['label-sip_port']."</td>\n";
 	echo "				<td class='vtable' nowrap='nowrap'>".$text['label-sip_transport']."</td>\n";
 	echo "				<td class='vtable' nowrap='nowrap'>".$text['label-register_expires']."</td>\n";
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index c3547acc49..d841ba1858 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -915,7 +915,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	if ($action == "update") {
+	if (permission_exists('extension_password' && $action == "update") {
 		echo "<tr>\n";
 		echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
 		echo "    ".$text['label-password']."\n";