diff --git a/templates/zephyr/home.html b/templates/zephyr/home.html
index e1b0e9cde8..4053c9e4a9 100644
--- a/templates/zephyr/home.html
+++ b/templates/zephyr/home.html
@@ -55,7 +55,7 @@
                                           </tr>
                                           <tr id="personal-message">
                                             <td colspan="3" class="zephyr_newstyle_pm">
-                                              Huddle with <input type="text" class="zephyr_recipient_box" name="recipient" id="recipient" value="" placeholder="one or more of your friends..." autocomplete="off"/>
+                                              Huddle with <input type="text" class="zephyr_recipient_box" name="recipient" id="huddle_recipient" value="" placeholder="one or more of your friends..." autocomplete="off"/>
                                             </td>
                                           </tr>
                                           <tr>
diff --git a/zephyr/static/js/compose.js b/zephyr/static/js/compose.js
index a160f45130..1db9e64fa3 100644
--- a/zephyr/static/js/compose.js
+++ b/zephyr/static/js/compose.js
@@ -25,7 +25,7 @@ function compose_button() {
 function toggle_compose() {
     if ($("#zephyr-type-tabs li.active").find("a[href=#class-message]").length !== 0) {
         // In class tab, switch to personals.
-        show_compose('personal', $("#recipient"));
+        show_compose('personal', $("#huddle_recipient"));
     } else {
         show_compose('class', $("#class"));
     }
@@ -52,7 +52,7 @@ function compose_message() {
 }
 
 function compose_recipient() {
-    return $.trim($("#recipient").val());
+    return $.trim($("#huddle_recipient").val());
 }
 
 function compose_huddle_message() {
@@ -138,7 +138,7 @@ function validate_class_message() {
 
 function validate_huddle_message() {
     if (compose_recipient() === "") {
-        compose_error("Please specify at least one recipient", $("#recipient"));
+        compose_error("Please specify at least one recipient", $("#huddle_recipient"));
         return false;
     }
 
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index 00a5b62539..67a1e32d09 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -89,7 +89,7 @@ function update_autocomplete() {
         source: instance_list,
         items: 2
     });
-    $( "#recipient" ).typeahead({
+    $( "#huddle_recipient" ).typeahead({
         source: people_list,
         items: 4,
         matcher: function (item) {
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 1cbbe69b52..2c792a56ef 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -195,7 +195,7 @@ function select_zephyr(next_zephyr, scroll_to) {
 function prepare_huddle(recipients) {
     // Used for both personals and huddles.
     show_compose('personal', $("#new_zephyr"));
-    $("#recipient").val(recipients);
+    $("#huddle_recipient").val(recipients);
 }
 
 function same_recipient(a, b) {