diff --git a/templates/zerver/register.html b/templates/zerver/register.html
index db52868c7b..60fd2dee1d 100644
--- a/templates/zerver/register.html
+++ b/templates/zerver/register.html
@@ -180,13 +180,13 @@ Form is validated both client-side using jquery-validation (see signup.js) and s
                           {% if "default_stream_group" in form.data and default_stream_group.id in form.data.getlist('default_stream_group') %} checked {% endif %} />
                         <span class="rendered-checkbox"></span>
                         {% set comma = joiner(", ") %}
-                        <div class="default_stream_group_name inline-block"
+                        <span class="default_stream_group_name inline-block"
                           title="{{ default_stream_group.description }}">
                             {{ default_stream_group.name }}
-                        </div>
+                        </span>
                         (
                         {%- for stream in default_stream_group.streams.all() -%}
-                            {{- comma() -}} <div class="stream_name inline-block">#{{ stream.name }}</div>
+                            {{- comma() -}} <span class="stream_name inline-block">#{{ stream.name }}</span>
                         {%- endfor -%}
                         )
                     </label>