diff --git a/zephyr/jstemplates/subscription.html b/zephyr/jstemplates/subscription.html
index 04e993c2a3..5a36496898 100644
--- a/zephyr/jstemplates/subscription.html
+++ b/zephyr/jstemplates/subscription.html
@@ -17,9 +17,18 @@
           Stream color
       </ul>
       {{#render_subscribers}}
-      <span class="sub_settings_title">Subscribers</span>
+      <div>
+        <span class="sub_settings_title">Subscribers</span>
+        <div class="subscriber_list_add">
+          <form class="form-inline">
+            <input type="text" name="principal" placeholder="Email address" value="" class="span2" />
+            <input type="submit" name="add_subscriber" value="Add" class="btn btn-primary" />
+          </form>
+        </div>
+      </div>
       <div class="subscriber_list_container">
         <div class="alert alert-error hide"></div>
+        <div class="alert alert-warning hide"></div>
         <ul>
         </ul>
       </div>
diff --git a/zephyr/static/js/subs.js b/zephyr/static/js/subs.js
index 1d0371167a..a34de4b343 100644
--- a/zephyr/static/js/subs.js
+++ b/zephyr/static/js/subs.js
@@ -295,14 +295,52 @@ $(function () {
         ajaxSubscribe($("#streams").val());
     });
 
+    if (! render_subscribers()) {
+        return;
+    }
 
-    $("#subscriptions_table").on("show", ".subscription_settings", function (e) {
-        if (! render_subscribers()) {
-            return;
-        }
+    // From here down is only stuff that happens when we're rendering
+    // the subscriber settings
+
+    $("#subscriptions_table").on("submit", ".subscriber_list_add form", function (e) {
+        e.preventDefault();
         var sub_row = $(e.target).closest('.subscription_row');
         var stream = sub_row.find('.subscription_name').text();
-        var error_elem = sub_row.find('.subscriber_list_container .alert');
+        var text_box = sub_row.find('input[name="principal"]');
+        var principal = text_box.val();
+        // TODO: clean up this error handling
+        var error_elem = sub_row.find('.subscriber_list_container .alert-error');
+        var warning_elem = sub_row.find('.subscriber_list_container .alert-warning');
+        var list = sub_row.find('.subscriber_list_container ul');
+
+        $.ajax({
+            type: "POST",
+            url: "/json/subscriptions/add",
+            dataType: 'json',
+            data: {"subscriptions": JSON.stringify([stream]),
+                   "principal": principal},
+            success: function (data) {
+                text_box.val('');
+                if (data.subscribed.length) {
+                    error_elem.addClass("hide");
+                    warning_elem.addClass("hide");
+                    list.prepend('<li>' + principal);
+                } else {
+                    error_elem.addClass("hide");
+                    warning_elem.removeClass("hide").text("User already subscribed");
+                }
+            },
+            error: function (xhr) {
+                warning_elem.addClass("hide");
+                error_elem.removeClass("hide").text("Could not add user to this stream");
+            }
+        });
+    });
+
+    $("#subscriptions_table").on("show", ".subscription_settings", function (e) {
+        var sub_row = $(e.target).closest('.subscription_row');
+        var stream = sub_row.find('.subscription_name').text();
+        var error_elem = sub_row.find('.subscriber_list_container .alert-error');
         var list = sub_row.find('.subscriber_list_container ul');
         error_elem.addClass('hide');
         list.empty();
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 928b0cbdda..a14150387d 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -615,6 +615,11 @@ table.floating_recipient {
 
 .subscription_settings {
     margin-left: 35px;
+    margin-right: 35px;
+}
+
+.subscription_settings form {
+    margin: 0;
 }
 
 .subscription_settings ul {
@@ -641,6 +646,11 @@ table.floating_recipient {
 .subscriber_list_container {
     max-height: 200px;
     overflow: auto;
+    margin-top: 10px;
+}
+
+.subscriber_list_add {
+    float: right;
 }
 
 #invite_user_form {