diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 32b6938152..c53af07369 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -873,6 +873,66 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		$voicemail_local_after_email = $_SESSION['voicemail']['keep_local']['boolean'];
 	}
 
+//get the device lines
+	$sql = "SELECT d.device_mac_address, d.device_template, d.device_description, l.device_line_uuid, l.device_uuid, l.line_number ";
+	$sql .= "FROM v_device_lines as l, v_devices as d ";
+	$sql .= "WHERE (l.user_id = '".$extension."' or l.user_id = '".$number_alias."')";
+	$sql .= "AND l.domain_uuid = '".$domain_uuid."' ";
+	$sql .= "AND l.device_uuid = d.device_uuid ";
+	$sql .= "ORDER BY l.line_number, d.device_mac_address asc ";
+	$prep_statement = $db->prepare(check_sql($sql));
+	$prep_statement->execute();
+	$device_lines = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+	unset($sql, $prep_statement);
+
+//get the devices
+	$sql = "SELECT * FROM v_devices ";
+	$sql .= "WHERE domain_uuid = '".$domain_uuid."' ";
+	$sql .= "ORDER BY device_mac_address asc ";
+	$prep_statement = $db->prepare(check_sql($sql));
+	$prep_statement->execute();
+	$devices = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+	unset($sql, $prep_statement);
+
+//get assigned users
+	$sql = "SELECT u.username, e.user_uuid FROM v_extension_users as e, v_users as u ";
+	$sql .= "where e.user_uuid = u.user_uuid  ";
+	$sql .= "and u.user_enabled = 'true' ";
+	$sql .= "and e.domain_uuid = '".$domain_uuid."' ";
+	$sql .= "and e.extension_uuid = '".$extension_uuid."' ";
+	$sql .= "order by u.username asc ";
+	$prep_statement = $db->prepare(check_sql($sql));
+	$prep_statement->execute();
+	$assigned_users = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+	foreach($assigned_users as $field) {
+		$assigned_user_uuids[] = $field['user_uuid'];
+	}
+	unset($sql, $prep_statement);
+
+//get the users
+	$sql = "SELECT * FROM v_users ";
+	$sql .= "where domain_uuid = '".$domain_uuid."' ";
+	foreach($assigned_user_uuids as $assigned_user_uuid) {
+		$sql .= "and user_uuid <> '".$assigned_user_uuid."' ";
+	}
+	unset($assigned_user_uuids);
+	$sql .= "and user_enabled = 'true' ";
+	$sql .= "order by username asc ";
+	$prep_statement = $db->prepare(check_sql($sql));
+	$prep_statement->execute();
+	$users = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+	unset($sql, $prep_statement);
+
+//get the destinations
+	$sql = "select * from v_destinations ";
+	$sql .= "where domain_uuid = '".$domain_uuid."' ";
+	$sql .= "and destination_type = 'inbound' ";
+	$sql .= "order by destination_number asc ";
+	$prep_statement = $db->prepare(check_sql($sql));
+	$prep_statement->execute();
+	$destinations = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
+	unset ($sql, $prep_statement);
+
 //set the defaults
 	if (strlen($limit_max) == 0) { $limit_max = '5'; }
 	if (strlen($call_timeout) == 0) { $call_timeout = '30'; }
@@ -1034,20 +1094,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "	<tr>";
 		echo "		<td class='vncell' valign='top'>".$text['label-user_list']."</td>";
 		echo "		<td class='vtable'>";
-
-		$sql = "SELECT u.username, e.user_uuid FROM v_extension_users as e, v_users as u ";
-		$sql .= "where e.user_uuid = u.user_uuid  ";
-		$sql .= "and u.user_enabled = 'true' ";
-		$sql .= "and e.domain_uuid = '".$domain_uuid."' ";
-		$sql .= "and e.extension_uuid = '".$extension_uuid."' ";
-		$sql .= "order by u.username asc ";
-		$prep_statement = $db->prepare(check_sql($sql));
-		$prep_statement->execute();
-		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-		$result_count = count($result);
-		if ($result_count > 0) {
+		if (count($assigned_users) > 0) {
 			echo "		<table width='30%'>\n";
-			foreach($result as $field) {
+			foreach($assigned_users as $field) {
 				echo "		<tr>\n";
 				echo "			<td class='vtable'><a href='/core/users/usersupdate.php?id=".$field['user_uuid']."'>".$field['username']."</a></td>\n";
 				echo "			<td>\n";
@@ -1055,30 +1104,19 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 				//echo "				<a href='extension_edit.php?id=".$extension_uuid."&domain_uuid=".$_SESSION['domain_uuid']."&user_uuid=".$field['user_uuid']."&a=delete' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
 				echo "			</td>\n";
 				echo "		</tr>\n";
-				$assigned_user_uuids[] = $field['user_uuid'];
 			}
 			echo "		</table>\n";
 			echo "		<br />\n";
 		}
-		$sql = "SELECT * FROM v_users ";
-		$sql .= "where domain_uuid = '".$domain_uuid."' ";
-		foreach($assigned_user_uuids as $assigned_user_uuid) {
-			$sql .= "and user_uuid <> '".$assigned_user_uuid."' ";
-		}
-		unset($assigned_user_uuids);
-		$sql .= "and user_enabled = 'true' ";
-		$sql .= "order by username asc ";
-		$prep_statement = $db->prepare(check_sql($sql));
-		$prep_statement->execute();
+
 		echo "			<select name='user_uuid' id='user_uuid' class='formfld' style='width: auto;'>\n";
 		echo "			<option value=''></option>\n";
-		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-		foreach($result as $field) {
+		foreach($users as $field) {
 			echo "			<option value='".$field['user_uuid']."'>".$field['username']."</option>\n";
 		}
 		echo "			</select>";
 		echo "			<input type=\"submit\" class='btn' value=\"".$text['button-add']."\">\n";
-		unset($sql, $result);
+		
 		echo "			<br>\n";
 		echo "			".$text['description-user_list']."\n";
 		echo "			<br />\n";
@@ -1128,18 +1166,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			//}
 			echo "				</td>\n";
 			echo "			</tr>\n";
-
-			$sql = "SELECT d.device_mac_address, d.device_template, d.device_description, l.device_line_uuid, l.device_uuid, l.line_number ";
-			$sql .= "FROM v_device_lines as l, v_devices as d ";
-			$sql .= "WHERE l.user_id = '".$extension."' ";
-			$sql .= "AND l.domain_uuid = '".$domain_uuid."' ";
-			$sql .= "AND l.device_uuid = d.device_uuid ";
-			$sql .= "ORDER BY l.line_number, d.device_mac_address asc ";
-			$prep_statement = $db->prepare(check_sql($sql));
-			$prep_statement->execute();
-			$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-			$result_count = count($result);
-			foreach($result as $row) {
+			foreach($device_lines as $row) {
 				$device_mac_address = $row['device_mac_address'];
 				$device_mac_address = substr($device_mac_address, 0,2).'-'.substr($device_mac_address, 2,2).'-'.substr($device_mac_address, 4,2).'-'.substr($device_mac_address, 6,2).'-'.substr($device_mac_address, 8,2).'-'.substr($device_mac_address, 10,2);
 				echo "		<tr>\n";
@@ -1201,15 +1228,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			}
 			</script>
 			<?php
-			$sql = "SELECT * FROM v_devices ";
-			$sql .= "WHERE domain_uuid = '".$domain_uuid."' ";
-			$sql .= "ORDER BY device_mac_address asc ";
-			$prep_statement = $db->prepare(check_sql($sql));
-			$prep_statement->execute();
-			$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
 			echo "				<select id=\"device_mac_address\" name=\"device_mac_address\" class='formfld' style='width: 180px;' onchange='changeToInput_device_mac_address(this);this.style.visibility = \"hidden\";'>\n";
 			echo "					<option value=''></option>\n";
-			if (count($result) > 0) {
+			if (count($devices) > 0) {
 				foreach($result as $field) {
 					if (strlen($field["device_mac_address"]) > 0) {
 						if ($field_current_value == $field["device_mac_address"]) {
@@ -1221,7 +1242,6 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 					}
 				}
 			}
-			unset($sql, $result, $result_count);
 			echo "				</select>\n";
 			echo "				<input type='button' id='btn_select_to_input_device_mac_address' class='btn' name='' alt='".$text['button-back']."' onclick='changeToInput_device_mac_address(document.getElementById(\"device_mac_address\"));this.style.visibility = \"hidden\";' value='&#9665;'>\n";
 			echo "	</td>\n";
@@ -1337,17 +1357,10 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	if (permission_exists('outbound_caller_id_select')) {
-		$sql = "select * from v_destinations ";
-		$sql .= "where domain_uuid = '".$domain_uuid."' ";
-		$sql .= "and destination_type = 'inbound' ";
-		$sql .= "order by destination_number asc ";
-		$prep_statement = $db->prepare(check_sql($sql));
-		$prep_statement->execute();
-		$result = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
-		if (count($result) > 0) {
+		if (count($destinations) > 0) {
 			echo "	<select name='outbound_caller_id_name' id='outbound_caller_id_name' class='formfld'>\n";
 			echo "	<option value=''></option>\n";
-			foreach ($result as &$row) {
+			foreach ($destinations as &$row) {
 				if ($outbound_caller_id_name == $row["destination_caller_id_name"]) {
 					echo "		<option value='".$row["destination_caller_id_name"]."' selected='selected'>".$row["destination_caller_id_name"]."</option>\n";
 				}
@@ -1362,7 +1375,6 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		else {
 			echo "	<input type=\"button\" class=\"btn\" name=\"\" alt=\"".$text['button-add']."\" onclick=\"window.location='".PROJECT_PATH."/app/destinations/destinations.php'\" value='".$text['button-add']."'>\n";
 		}
-		unset ($prep_statement);
 	}
 	else {
 		echo "    <input class='formfld' type='text' name='outbound_caller_id_name' maxlength='255' value=\"$outbound_caller_id_name\">\n";
@@ -1378,17 +1390,10 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	if (permission_exists('outbound_caller_id_select')) {
-		$sql = "select * from v_destinations ";
-		$sql .= "where domain_uuid = '".$domain_uuid."' ";
-		$sql .= "and destination_type = 'inbound' ";
-		$sql .= "order by destination_number asc ";
-		$prep_statement = $db->prepare(check_sql($sql));
-		$prep_statement->execute();
-		$result = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
-		if (count($result) > 0) {
+		if (count($destinations) > 0) {
 			echo "	<select name='outbound_caller_id_number' id='outbound_caller_id_number' class='formfld'>\n";
 			echo "	<option value=''></option>\n";
-			foreach ($result as &$row) {
+			foreach ($destinations as &$row) {
 				if ($outbound_caller_id_number == $row["destination_caller_id_number"]) {
 					echo "		<option value='".$row["destination_caller_id_number"]."' selected='selected'>".$row["destination_caller_id_number"]."</option>\n";
 				}