diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php
index 6a56f2c539..77119c24f1 100644
--- a/app/ring_groups/ring_group_edit.php
+++ b/app/ring_groups/ring_group_edit.php
@@ -546,7 +546,7 @@ else {
 			echo "			<td>\n";
 			echo "				<select class='formfld' style='width: 90px;' name='ring_group_destinations[".$x."][destination_prompt]'>\n";
 			echo "					<option value=''></option>\n";
-			echo "					<option value='1'".(($row['destination_prompt'])?"selected='selected'":null).">".$text['label-destination_prompt_confirm']."</option>\n";
+			echo "					<option value='1' ".(($row['destination_prompt'])?"selected='selected'":null).">".$text['label-destination_prompt_confirm']."</option>\n";
 			//echo "				<option value='2'>".$text['label-destination_prompt_announce]."</option>\n";
 			echo "				</select>\n";
 			echo "			</td>\n";
@@ -558,7 +558,6 @@ else {
 		}
 		echo "				</td>\n";
 		echo "			</tr>\n";
-
 		$x++;
 	}
 	echo "			</table>\n";
diff --git a/resources/install/scripts/app/ring_groups/index.lua b/resources/install/scripts/app/ring_groups/index.lua
index d7f24cc093..0a92a1f6bb 100644
--- a/resources/install/scripts/app/ring_groups/index.lua
+++ b/resources/install/scripts/app/ring_groups/index.lua
@@ -1,6 +1,6 @@
 --	ring_groups.lua
 --	Part of FusionPBX
---	Copyright (C) 2010-2013 Mark J Crane <markjcrane@fusionpbx.com>
+--	Copyright (C) 2010-2014 Mark J Crane <markjcrane@fusionpbx.com>
 --	All rights reserved.
 --
 --	Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,6 @@
 --	Mark J Crane <markjcrane@fusionpbx.com>
 --	Luis Daniel Lucio Qurioz <dlucio@okay.com.mx>
 
-
 --connect to the database
 	dofile(scripts_dir.."/resources/functions/database_handle.lua");
 	dbh = database_handle('system');
@@ -56,6 +55,7 @@
 	source = session:getVariable("source");
 	uuid = session:getVariable("uuid");
 	context = session:getVariable("context");
+	call_direction = session:getVariable("call_direction");
 
 --define additional variables
 	uuids = "";
@@ -69,6 +69,20 @@
 	if (not default_dialect) then default_dialect = 'us'; end
 	if (not default_voice) then default_voice = 'callie'; end
 
+--get record_ext
+	if (session:getVariable("record_ext")) then
+		record_ext = session:getVariable("record_ext");
+	else
+		record_ext = "wav";
+	end
+
+--set the recording path
+	recording_archive = recordings_dir
+	if (domain_count > 1) then
+		recording_archive = recording_archive.."/"..domain_name;
+	end
+	recording_archive = recording_archive.."/archive/"..(os.date("%Y")).."/"..(os.date("%b")).."/"..(os.date("%d"));
+
 --prepare the api object
 	api = freeswitch.API();
 
@@ -100,7 +114,7 @@
 --set confirm
 --	session:execute("set", "group_confirm_key=exec");
 --	session:execute("set", "group_confirm_file=lua ".. scripts_dir .."/confirm.lua");
-	
+
 --process the ring group
 	if (ring_group_forward_enabled == "true" and string.len(ring_group_forward_destination) > 0) then
 		--forward the ring group
@@ -114,7 +128,7 @@
 			and d.ring_group_uuid = ']]..ring_group_uuid..[[' 
 			and r.ring_group_enabled = 'true' 
 			order by d.destination_delay, d.destination_number asc ]]
-			freeswitch.consoleLog("notice", "SQL:" .. sql .. "\n");
+			--freeswitch.consoleLog("notice", "SQL:" .. sql .. "\n");
 			destinations = {};
 			x = 1;
 			assert(dbh:query(sql, function(row)
@@ -244,6 +258,29 @@
 						group_confirm = "";
 					end
 
+				--get user_record value and determine whether to record the session
+					cmd = "user_data ".. destination_number .."@"..domain_name.." var user_record";
+					user_record = trim(api:executeString(cmd));
+					--set the record_session variable
+					if (user_record == "all") then
+						record_session = true;
+					end
+					if (user_record == "inbound" and call_direction == "inbound") then
+						record_session = true;
+					end
+					if (user_record == "outbound" and call_direction == "outbound") then
+						record_session = true;
+					end
+					if (user_record == "local" and call_direction == "local") then
+						record_session = true;
+					end
+
+				--record the session
+					if (record_session) then
+						cmd = "uuid_record "..uuid.." start "..recording_archive.."/"..uuid.."."..record_ext;
+						response = api:executeString(cmd);
+					end
+
 				--process according to user_exists, sip_uri, external number
 					if (user_exists == "true") then
 						--get the extension_uuid
@@ -449,4 +486,4 @@
 	--table.insert(ACTIONS, {"set", "hangup_after_bridge=true"});
 	--table.insert(ACTIONS, {"set", "continue_on_fail=true"});
 	--table.insert(ACTIONS, {"bridge", app_data});
-	--table.insert(ACTIONS, {ring_group_timeout_app, ring_group_timeout_data});
+	--table.insert(ACTIONS, {ring_group_timeout_app, ring_group_timeout_data});
\ No newline at end of file