diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index e852960..2d61fd3 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -2504,66 +2504,41 @@ define(function(require) {
 			ttsGreeting.find('.update-greeting').on('click', function(e) {
 				var text = ttsGreeting.find('textarea').val();
 				if (text) {
-					if (greeting && greeting.id) {
-						greeting.type = 'virtual_receptionist';
-						greeting.description = '<Text to Speech>';
-						greeting.media_source = 'tts';
-						greeting.tts = {
-							voice: 'female/en-US',
-							text: text
-						};
-						self.callApi({
-							resource: 'media.update',
+					self.callApi({
+						resource: 'media.create',
+						data: {
+							accountId: self.accountId,
 							data: {
-								accountId: self.accountId,
-								mediaId: greeting.id,
-								data: greeting
-							},
-							success: function(data, status) {
-								greeting = data.data;
-								container.find('.greeting-option').removeClass('active');
-								ttsGreeting.parents('.greeting-option').addClass('active');
-								ttsGreeting.collapse('hide');
+								streamable: true,
+								name: callflowName + 'TTS',
+								media_source: 'tts',
+								description: '<Text to Speech>',
+								tts: {
+									voice: 'female/en-US',
+									text: text
+								}
 							}
-						});
-					} else {
-						self.callApi({
-							resource: 'media.create',
-							data: {
-								accountId: self.accountId,
+						},
+						success: function(data, status) {
+							greeting = data.data;
+							menu.media.greeting = data.data.id;
+							self.callApi({
+								resource: 'menu.update',
 								data: {
-									streamable: true,
-									name: callflowName,
-									type: 'virtual_receptionist',
-									media_source: 'tts',
-									description: '<Text to Speech>',
-									tts: {
-										voice: 'female/en-US',
-										text: text
-									}
+									accountId: self.accountId,
+									menuId: menu.id,
+									data: menu
+								},
+								success: function(data, status) {
+									menu = data.data;
 								}
-							},
-							success: function(data, status) {
-								greeting = data.data;
-								menu.media.greeting = data.data.id;
-								self.callApi({
-									resource: 'menu.update',
-									data: {
-										accountId: self.accountId,
-										menuId: menu.id,
-										data: menu
-									},
-									success: function(data, status) {
-										menu = data.data;
-									}
-								});
+							});
 
-								container.find('.greeting-option').removeClass('active');
-								ttsGreeting.parents('.greeting-option').addClass('active');
-								ttsGreeting.collapse('hide');
-							}
-						});
-					}
+							container.find('.greeting-option').removeClass('active');
+							ttsGreeting.parents('.greeting-option').addClass('active');
+							ttsGreeting.collapse('hide');
+						}
+					});
 				} else {
 					monster.ui.alert(self.i18n.active().strategy.alertMessages.emptyTtsGreeting);
 				}
@@ -2585,64 +2560,39 @@ define(function(require) {
 				};
 
 				if (mediaToUpload) {
-					if (greeting && greeting.id) {
-						greeting.type = 'virtual_receptionist';
-						greeting.description = mediaToUpload.name;
-						greeting.media_source = 'upload';
-						delete greeting.tts;
-
-						self.callApi({
-							resource: 'media.update',
+					self.callApi({
+						resource: 'media.create',
+						data: {
+							accountId: self.accountId,
 							data: {
-								accountId: self.accountId,
-								mediaId: greeting.id,
-								data: greeting
-							},
-							success: function(data, status) {
-								greeting = data.data;
-								uploadFile(mediaToUpload.file, greeting.id, function() {
-									container.find('.greeting-option').removeClass('active');
-									uploadGreeting.parents('.greeting-option').addClass('active');
-									uploadGreeting.collapse('hide');
-								});
+								streamable: true,
+								name: mediaToUpload.name,
+								media_source: 'upload',
+								description: mediaToUpload.name
 							}
-						});
-					} else {
-						self.callApi({
-							resource: 'media.create',
-							data: {
-								accountId: self.accountId,
+						},
+						success: function(data, status) {
+							greeting = data.data;
+							menu.media.greeting = greeting.id;
+							self.callApi({
+								resource: 'menu.update',
 								data: {
-									streamable: true,
-									name: callflowName,
-									type: 'virtual_receptionist',
-									media_source: 'upload',
-									description: mediaToUpload.name
+									accountId: self.accountId,
+									menuId: menu.id,
+									data: menu
+								},
+								success: function(data, status) {
+									menu = data.data;
 								}
-							},
-							success: function(data, status) {
-								greeting = data.data;
-								menu.media.greeting = greeting.id;
-								self.callApi({
-									resource: 'menu.update',
-									data: {
-										accountId: self.accountId,
-										menuId: menu.id,
-										data: menu
-									},
-									success: function(data, status) {
-										menu = data.data;
-									}
-								});
+							});
 
-								uploadFile(mediaToUpload.file, greeting.id, function() {
-									container.find('.greeting-option').removeClass('active');
-									uploadGreeting.parents('.greeting-option').addClass('active');
-									uploadGreeting.collapse('hide');
-								});
-							}
-						});
-					}
+							uploadFile(mediaToUpload.file, greeting.id, function() {
+								container.find('.greeting-option').removeClass('active');
+								uploadGreeting.parents('.greeting-option').addClass('active');
+								uploadGreeting.collapse('hide');
+							});
+						}
+					});
 				} else {
 					monster.ui.alert(self.i18n.active().strategy.alertMessages.emptyUploadGreeting);
 				}
diff --git a/views/strategy-menuPopup.html b/views/strategy-menuPopup.html
index 9753388..7fa1f07 100644
--- a/views/strategy-menuPopup.html
+++ b/views/strategy-menuPopup.html
@@ -16,8 +16,8 @@
 			<div class="content">
 				<div id="strategy_menu_popup_accordion">
 					<div class="greeting-option accordion-group {{#compare greeting.media_source '===' 'tts'}}active{{/compare}}">
-						<div class="greeting-option-header" data-toggle="collapse" 
-							 data-parent="#strategy_menu_popup_accordion" 
+						<div class="greeting-option-header" data-toggle="collapse"
+							 data-parent="#strategy_menu_popup_accordion"
 							 data-target="#strategy_menu_popup_tts_greeting">
 							<div class="pull-right"><i class="fa fa-comment"></i></div>
 							<div>{{i18n.strategy.popup.ttsGreetingTitle}}</div>
@@ -37,9 +37,9 @@
 							</div>
 						</div>
 					</div>
-					<div class="greeting-option accordion-group {{#compare greeting.media_source '===' 'upload'}}active{{/compare}}">
-						<div class="greeting-option-header" data-toggle="collapse" 
-							 data-parent="#strategy_menu_popup_accordion" 
+					<div class="greeting-option accordion-group">
+						<div class="greeting-option-header" data-toggle="collapse"
+							 data-parent="#strategy_menu_popup_accordion"
 							 data-target="#strategy_menu_popup_upload_greeting">
 							<div class="pull-right"><i class="fa fa-upload"></i></div>
 							<div>{{i18n.strategy.popup.uploadGreetingTitle}}</div>
@@ -57,7 +57,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="greeting-option accordion-group {{#compare greeting.media_source '===' 'existing'}}active{{/compare}}">
+					<div class="greeting-option accordion-group {{#compare greeting.media_source '===' 'upload'}}active{{/compare}}">
 						<div class="greeting-option-header" data-toggle="collapse"
 							data-parent="#strategy_menu_popup_accordion"
 							data-target="#strategy_menu_popup_choose_existing">
@@ -71,9 +71,11 @@
 								{{/monsterText}}
 								{{#if greetingFiles}}
 								<select class="choose-input">
-									{{#each greetingFiles}}
-										<option class="media-file-option" value="{{this.id}}">{{this.name}}</option>
-									{{/each}}
+									{{#select greeting.id}}
+										{{#each greetingFiles}}
+											<option class="media-file-option" value="{{this.id}}">{{this.name}}</option>
+										{{/each}}
+									{{/select}}
 								</select>
 								<div class="greeting-option-actions clearfix">
 									<button class="update-greeting pull-right monster-button-mini monster-button-primary">{{i18n.update}}</button>
@@ -87,8 +89,8 @@
 						</div>
 					</div>
 					<div class="greeting-option accordion-group {{#compare greeting.media_source '===' 'recording'}}active{{/compare}}">
-						<div class="greeting-option-header" data-toggle="collapse" 
-							 data-parent="#strategy_menu_popup_accordion" 
+						<div class="greeting-option-header" data-toggle="collapse"
+							 data-parent="#strategy_menu_popup_accordion"
 							 data-target="#strategy_menu_popup_record_greeting">
 							<div class="pull-right"><i class="fa fa-info-circle"></i></div>
 							<div>{{i18n.strategy.popup.recordGreetingTitle}}</div>