diff --git a/views/_main.html b/views/_main.html
index 54f4e604f..7a8eef853 100644
--- a/views/_main.html
+++ b/views/_main.html
@@ -140,10 +140,10 @@
                                 <div class="dropdown-menu dropdown-menu-right scale-up">
                                     <ul class="dropdown-user">
                                         <li><a id="restart"><i class="fas fa-redo"></i> Restart</a></li>
-                                        <li><a id="shutdown""><i class="fas fa-power-off"></i>
-                                            Shutdown</a></li>
-                                        <li><a href="{{ url_for('logout') }}"><i class="fas fa-sign-out-alt"></i> Logout</a>
-                                        </li>
+                                        <li><a id="shutdown"><i class="fas fa-power-off"></i> Shutdown</a></li>
+                                        {% if settings.auth.type != 'None' %}
+                                        <li><a href="{{ url_for('logout') }}"><i class="fas fa-sign-out-alt"></i> Logout</a></li>
+                                        {% endif %}
                                     </ul>
                                 </div>
                             </li>
diff --git a/views/episodes.html b/views/episodes.html
index 631c51e56..212074e8b 100644
--- a/views/episodes.html
+++ b/views/episodes.html
@@ -339,6 +339,15 @@
                 responsive: true,
                 pageLength: {{ settings.general.page_size }},
                 ajax: "{{ url_for('api.episodes') }}?seriesid={{id}}",
+                initComplete: function() {
+                    $('.dtrg-start').each( function(i, item) {
+                        if (i > 0) {
+                            var name = $(item).data('name');
+                            collapsedGroups[name] = !collapsedGroups[name];
+                            table.draw(false);
+                        }
+                    })
+                },
                 rowGroup: {
                     dataSrc: 'season',
                     startRender: function (rows, group) {