diff --git a/zephyr/jstemplates/invite_subscription.html b/zephyr/jstemplates/invite_subscription.html
index 873375ef17..05b808d12a 100644
--- a/zephyr/jstemplates/invite_subscription.html
+++ b/zephyr/jstemplates/invite_subscription.html
@@ -2,9 +2,11 @@
 <a href="#" onclick="invite.set_all_streams(event, true);">Check all</a> |
 <a href="#" onclick="invite.set_all_streams(event, false);">Uncheck all</a>
 <div id="stream-checkboxes">
-  {{#each subscriptions}}
+  {{#each streams}}
   <label class="checkbox">
-    <input type="checkbox" name="stream" value="{{this}}" checked="true"> {{this}}
+    <input type="checkbox" name="stream" value="{{name}}"
+           {{#unless invite_only}}checked="true"{{/unless}}> {{name}}
+    {{#if invite_only}}<i class="icon-lock"></i>{{/if}}
   </label>
   {{/each}}
 </div>
diff --git a/zephyr/static/js/invite.js b/zephyr/static/js/invite.js
index 0a6ec33fd8..122ee12b91 100644
--- a/zephyr/static/js/invite.js
+++ b/zephyr/static/js/invite.js
@@ -7,8 +7,11 @@ function update_subscription_checkboxes() {
     // stream list has actually changed; that way, the settings of the
     // checkboxes are saved from invocation to invocation (which is
     // nice if I want to invite a bunch of people at once)
-    $('#streams_to_add').html(templates.invite_subscription({subscriptions:
-                                                             subs.subscribed_streams()}));
+    var streams = [];
+    $.each(subs.subscribed_streams(), function (index, value) {
+        streams.push({name: value, invite_only: subs.get_invite_only(value)});
+    });
+    $('#streams_to_add').html(templates.invite_subscription({streams: streams}));
 }
 
 function reset_error_messages() {