diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 90e994089d..0d9d00ed8e 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -964,7 +964,7 @@ zapretry:
 			}
 
 			/* trying to add moh for single person conf */
-			if ((confflags & CONFFLAG_MOH) && !( confflags & CONFFLAG_WAITMARKED)) {
+			if (confflags & CONFFLAG_MOH)  {
 				if (conf->users == 1) {
 					if (musiconhold == 0) {
 						ast_moh_start(chan, NULL);
@@ -979,7 +979,7 @@ zapretry:
 			}
 			
 			/* Leave if the last marked user left */
-			if (currentmarked == 0 && (confflags & CONFFLAG_MARKEDEXIT)) {
+			if (currentmarked == 0 && lastmarked != 0 && (confflags & CONFFLAG_MARKEDEXIT)) {
 				ret = -1;
 				break;
 			}
diff --git a/sounds/conf-onlyone.gsm b/sounds/conf-onlyone.gsm
new file mode 100755
index 0000000000..3584f00f9b
Binary files /dev/null and b/sounds/conf-onlyone.gsm differ
diff --git a/sounds/conf-otherinparty.gsm b/sounds/conf-otherinparty.gsm
new file mode 100755
index 0000000000..811263d8cd
Binary files /dev/null and b/sounds/conf-otherinparty.gsm differ
diff --git a/sounds/conf-thereare.gsm b/sounds/conf-thereare.gsm
new file mode 100755
index 0000000000..c810b170fa
Binary files /dev/null and b/sounds/conf-thereare.gsm differ