diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php
index 88044aa27a..694f3f8636 100644
--- a/app/ring_groups/ring_group_edit.php
+++ b/app/ring_groups/ring_group_edit.php
@@ -98,50 +98,52 @@
 	}
 
 //delete the user from the ring group
-	if (
-		(!empty($_GET["a"])) == "delete"
+	if ((!empty($_GET["a"])) == "delete"
 		&& is_uuid($_REQUEST["user_uuid"])
-		&& permission_exists("ring_group_edit")
-		) {
-		//set the variables
+		&& permission_exists("ring_group_edit")) {
+			//set the variables
 			$user_uuid = $_REQUEST["user_uuid"];
-		//build array
+
+			//build array
 			$array['ring_group_users'][0]['domain_uuid'] = $domain_uuid;
 			$array['ring_group_users'][0]['ring_group_uuid'] = $ring_group_uuid;
 			$array['ring_group_users'][0]['user_uuid'] = $user_uuid;
-		//grant temporary permissions
+
+			//grant temporary permissions
 			$p = new permissions;
 			$p->add('ring_group_user_delete', 'temp');
-		//execute delete
+
+			//execute delete
 			$database = new database;
 			$database->app_name = 'ring_groups';
 			$database->app_uuid = '1d61fb65-1eec-bc73-a6ee-a6203b4fe6f2';
 			$database->delete($array);
 			unset($array);
-		//revoke temporary permissions
+
+			//revoke temporary permissions
 			$p->delete('ring_group_user_delete', 'temp');
-		//save the message to a session variable
+
+			//save the message to a session variable
 			message::add($text['message-delete']);
-		//redirect the browser
+
+			//redirect the browser
 			header("Location: ring_group_edit.php?id=$ring_group_uuid");
 			exit;
 	}
 
 //get total ring group count from the database, check limit, if defined
-	if ($action == 'add') {
-		if ($_SESSION['limit']['ring_groups']['numeric'] ?? '') {
-			$sql = "select count(*) from v_ring_groups ";
-			$sql .= "where domain_uuid = :domain_uuid ";
-			$parameters['domain_uuid'] = $domain_uuid;
-			$database = new database;
-			$total_ring_groups = $database->select($sql, $parameters, 'column');
-			unset($sql, $parameters);
+	if ($action == 'add' && $_SESSION['limit']['ring_groups']['numeric'] ?? '') {
+		$sql = "select count(*) from v_ring_groups ";
+		$sql .= "where domain_uuid = :domain_uuid ";
+		$parameters['domain_uuid'] = $domain_uuid;
+		$database = new database;
+		$total_ring_groups = $database->select($sql, $parameters, 'column');
+		unset($sql, $parameters);
 
-			if (is_numeric($_SESSION['limit']['ring_groups']['numeric']) && $total_ring_groups >= $_SESSION['limit']['ring_groups']['numeric']) {
-				message::add($text['message-maximum_ring_groups'].' '.$_SESSION['limit']['ring_groups']['numeric'], 'negative');
-				header('Location: ring_groups.php');
-				exit;
-			}
+		if (is_numeric($_SESSION['limit']['ring_groups']['numeric']) && $total_ring_groups >= $_SESSION['limit']['ring_groups']['numeric']) {
+			message::add($text['message-maximum_ring_groups'].' '.$_SESSION['limit']['ring_groups']['numeric'], 'negative');
+			header('Location: ring_groups.php');
+			exit;
 		}
 	}
 
@@ -215,33 +217,58 @@
 				$ring_group_context = $_SESSION['domain_name'];
 			}
 
+		//if the user doesn't have the correct permission then
+		//override domain_uuid and ring_group_context values
+			if ($action == 'update' && is_uuid($ring_group_uuid)) {
+				$sql = "select * from v_ring_groups ";
+				$sql .= "where  ring_group_uuid = :ring_group_uuid ";
+				$parameters['ring_group_uuid'] = $ring_group_uuid;
+				$database = new database;
+				$row = $database->select($sql, $parameters, 'row');
+				if (!empty($row)) {
+					//if (!permission_exists(‘ring_group_domain')) {
+					//	$domain_uuid = $row["domain_uuid"];
+					//}
+					if (!permission_exists('ring_group_context')) {
+						$ring_group_context = $row["ring_group_context"];
+					}
+				}
+				unset($sql, $parameters, $row);
+			}
+
 	}
 
 //assign the user to the ring group
 	if (!empty($_REQUEST["user_uuid"]) && is_uuid($_REQUEST["id"]) && $_GET["a"] != "delete" && permission_exists("ring_group_edit")) {
 		//set the variables
-			$user_uuid = $_REQUEST["user_uuid"];
+		$user_uuid = $_REQUEST["user_uuid"];
+
 		//build array
-			$array['ring_group_users'][0]['ring_group_user_uuid'] = uuid();
-			$array['ring_group_users'][0]['domain_uuid'] = $domain_uuid;
-			$array['ring_group_users'][0]['ring_group_uuid'] = $ring_group_uuid;
-			$array['ring_group_users'][0]['user_uuid'] = $user_uuid;
+		$array['ring_group_users'][0]['ring_group_user_uuid'] = uuid();
+		$array['ring_group_users'][0]['domain_uuid'] = $domain_uuid;
+		$array['ring_group_users'][0]['ring_group_uuid'] = $ring_group_uuid;
+		$array['ring_group_users'][0]['user_uuid'] = $user_uuid;
+
 		//grant temporary permissions
-			$p = new permissions;
-			$p->add('ring_group_user_add', 'temp');
+		$p = new permissions;
+		$p->add('ring_group_user_add', 'temp');
+
 		//execute delete
-			$database = new database;
-			$database->app_name = 'ring_groups';
-			$database->app_uuid = '1d61fb65-1eec-bc73-a6ee-a6203b4fe6f2';
-			$database->save($array);
-			unset($array);
+		$database = new database;
+		$database->app_name = 'ring_groups';
+		$database->app_uuid = '1d61fb65-1eec-bc73-a6ee-a6203b4fe6f2';
+		$database->save($array);
+		unset($array);
+
 		//revoke temporary permissions
-			$p->delete('ring_group_user_add', 'temp');
+		$p->delete('ring_group_user_add', 'temp');
+
 		//set message
-			message::add($text['message-add']);
+		message::add($text['message-add']);
+
 		//redirect the browser
-			header("Location: ring_group_edit.php?id=".urlencode($ring_group_uuid));
-			exit;
+		header("Location: ring_group_edit.php?id=".urlencode($ring_group_uuid));
+		exit;
 	}
 
 //process the HTTP POST
@@ -876,7 +903,7 @@
 	echo "			<table border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "				<tr>\n";
 	echo "					<td class='vtable'>".$text['label-destination_number']."</td>\n";
-	
+
 	echo "					<td class='vtable' id='destination_delayorder'>";
 	echo 						($ring_group_strategy == 'sequence' || $ring_group_strategy == 'rollover') ? $text['label-destination_order'] : $text['label-destination_delay'];
 	echo "					</td>\n";