diff --git a/data/interfaces/default/export_modal.html b/data/interfaces/default/export_modal.html
index 0018e9b5..e4e2b3ee 100644
--- a/data/interfaces/default/export_modal.html
+++ b/data/interfaces/default/export_modal.html
@@ -243,7 +243,7 @@ DOCUMENTATION :: END
             async: true,
             success: function (data) {
                 if (data.result === 'success') {
-                    $("a[href=#tabs-export]").click();
+                    $("#nav-tabs-export").click();
                     redrawExportTable();
                     showMsg('<i class="fa fa-check"></i> ' + data.message, false, true, 5000);
                 } else {
diff --git a/data/interfaces/default/graphs.html b/data/interfaces/default/graphs.html
index 43e83ef3..0662e74d 100644
--- a/data/interfaces/default/graphs.html
+++ b/data/interfaces/default/graphs.html
@@ -41,13 +41,13 @@
         </div>
     </div>
     <div class="table-card-back">
-        <ul class="nav nav-pills" role="tablist" id="graph-tabs">
-            <li role="presentation"><a href="#tabs-1" aria-controls="tabs-1" data-toggle="tab" role="tab">Plays by Period</a></li>
-            <li role="presentation"><a href="#tabs-2" aria-controls="tabs-2" data-toggle="tab" role="tab">Stream Info</a></li>
-            <li role="presentation"><a href="#tabs-3" aria-controls="tabs-3" data-toggle="tab" role="tab">Play Totals</a></li>
+        <ul class="nav nav-list nav-pills" role="tablist" id="graph-tabs">
+            <li role="presentation"><a id="nav-tabs-plays" href="#tabs-plays" aria-controls="tabs-plays" data-toggle="tab" role="tab">Plays by Period</a></li>
+            <li role="presentation"><a id="nav-tabs-stream" href="#tabs-stream" aria-controls="tabs-stream" data-toggle="tab" role="tab">Stream Info</a></li>
+            <li role="presentation"><a id="nav-tabs-total" href="#tabs-total" aria-controls="tabs-total" data-toggle="tab" role="tab">Play Totals</a></li>
         </ul>
         <div class="tab-content">
-            <div role="tabpanel" class="tab-pane" id="tabs-1">
+            <div role="tabpanel" class="tab-pane" id="tabs-plays">
                 <div class="row">
                     <div class="col-md-12">
                         <h4><i class="fa fa-history"></i> Daily <span class="yaxis-text">Play count</span> <small>Last <span class="days">30</span> days</small></h4>
@@ -123,7 +123,7 @@
                     </div>
                 </div>
             </div>
-            <div role="tabpanel" class="tab-pane" id="tabs-2">
+            <div role="tabpanel" class="tab-pane" id="tabs-stream">
                 <div class="row">
                     <div class="col-md-12">
                         <h4><i class="fa fa-video-camera"></i> Daily Stream type breakdown <small>Last <span class="days">30</span> days</small></h4>
@@ -195,7 +195,7 @@
                     </div>
                 </div>
             </div>
-            <div role="tabpanel" class="tab-pane" id="tabs-3">
+            <div role="tabpanel" class="tab-pane" id="tabs-total">
                 <div class="row">
                     <div class="col-md-12">
                         <h4><i class="fa fa-calendar"></i> Plays by month <small>Last <span class="months">12</span> months</small></h4>
@@ -341,14 +341,30 @@
         var yaxis = getLocalStorage('graph_type', 'plays');
         var current_day_range = getLocalStorage('graph_days', 30);
         var current_month_range = getLocalStorage('graph_months', 12);
-        var current_tab = '#' + getLocalStorage('graph_tab', 'tabs-1');
+        var current_tab = '#' + getLocalStorage('graph_tab', 'tabs-plays');
+
+        // Update tab values from upgrading
+        switch (current_tab) {
+            case '#tabs-1':
+                current_tab = '#tabs-plays'
+                break
+            case '#tabs-2':
+                current_tab = '#tabs-strea'
+                break
+            case '#tabs-3':
+                current_tab = '#tabs-total'
+                break
+            default:
+                current_tab = '#tabs-plays'
+                break
+        }
 
         $('#yaxis-' + yaxis).prop('checked', true);
         $('#yaxis-' + yaxis).closest('label').addClass('active');
         $('#graph-days').val(current_day_range);
         $('#graph-months').val(current_month_range);
-        $('#graph-tabs a[href="' + current_tab + '"]').closest('li').addClass('active');
-        $(current_tab).addClass('active');
+        $('#nav-' + current_tab.replace('#', "")).tab('show').trigger('show.bs.tab');
+        //$(current_tab).addClass('active');
 
 
         $('.days').html(current_day_range);
@@ -469,7 +485,7 @@
                 }
             });
 
-            $('#graph-tabs a[href="#tabs-1"]').tab('show')
+            $('#nav-tabs-plays').tab('show');
         }
 
         function loadGraphsTab2(time_range, yaxis) {
@@ -562,7 +578,7 @@
                 }
             });
 
-            $('#graph-tabs a[href="#tabs-2"]').tab('show')
+            $('#nav-tabs-2').tab('show');
         }
 
         function loadGraphsTab3(time_range, yaxis) {
@@ -586,16 +602,16 @@
                 }
             });
 
-            $('#graph-tabs a[href="#tabs-3"]').tab('show')
+            $('#nav-tabs-total').tab('show');
         }
 
         // Set initial state
-        if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
-        if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
-        if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
+        if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); }
+        if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); }
+        if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); }
 
         // Tab1 opened
-        $('#graph-tabs a[href="#tabs-1"]').on('shown.bs.tab', function (e) {
+        $('#nav-tabs-plays').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
             setLocalStorage('graph_tab', current_tab.replace('#',''));
@@ -603,7 +619,7 @@
         });
 
         // Tab2 opened
-        $('#graph-tabs a[href="#tabs-2"]').on('shown.bs.tab', function (e) {
+        $('#nav-tabs-stream').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
             setLocalStorage('graph_tab', current_tab.replace('#',''));
@@ -611,7 +627,7 @@
         });
 
         // Tab3 opened
-        $('#graph-tabs a[href="#tabs-3"]').on('shown.bs.tab', function (e) {
+        $('#nav-tabs-total').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
             setLocalStorage('graph_tab', current_tab.replace('#',''));
@@ -624,8 +640,8 @@
             forceMinMax($(this));
             current_day_range = $(this).val();
             setLocalStorage('graph_days', current_day_range);
-            if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
-            if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
+            if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); }
+            if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); }
             $('.days').html(current_day_range);
         });
         
@@ -635,25 +651,25 @@
             forceMinMax($(this));
             current_month_range = $(this).val();
             setLocalStorage('graph_months', current_month_range);
-            if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
+            if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); }
             $('.months').html(current_month_range);
         });
 
         // User changed
         $('#graph-user').on('change', function() {
             selected_user_id = $(this).val() || null;
-            if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
-            if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
-            if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
+            if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); }
+            if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); }
+            if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); }
         });
         
         // Y-axis changed
         $('#yaxis-selection').on('change', function() {
             yaxis = $('input[name=yaxis-options]:checked', '#yaxis-selection').val();
             setLocalStorage('graph_type', yaxis);
-            if (current_tab === '#tabs-1') { loadGraphsTab1(current_day_range, yaxis); }
-            if (current_tab === '#tabs-2') { loadGraphsTab2(current_day_range, yaxis); }
-            if (current_tab === '#tabs-3') { loadGraphsTab3(current_month_range, yaxis); }
+            if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); }
+            if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); }
+            if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); }
         });
 
         function setGraphFormat(type) {
diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index ab764886..7ff5f378 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -535,8 +535,8 @@ DOCUMENTATION :: END
                 <div class="col-md-12">
                     <div class="table-card-header">
                         <ul class="nav nav-list nav-pills" role="tablist">
-                            <li class="${history_active}"><a href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
-                            <li class="${export_active}"><a href="#tabs-export" role="tab" data-toggle="tab">Export</a></li>
+                            <li class="${history_active}"><a id="nav-tabs-history" href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
+                            <li class="${export_active}"><a id="nav-tabs-export" href="#tabs-export" role="tab" data-toggle="tab">Export</a></li>
                         </ul>
                         <div class="button-bar">
                             % if source == 'history':
@@ -918,7 +918,7 @@ DOCUMENTATION :: END
         var hash = document.location.hash;
         var prefix = "tab_";
         if (hash) {
-            $('.nav-list a[href=' + hash.replace(prefix, "") + ']').tab('show').trigger('show.bs.tab');
+            $('.nav-list #nav-' + hash.replace('#' + prefix, "")).tab('show').trigger('show.bs.tab');
         }
 
         // Change hash for page-reload
@@ -989,7 +989,7 @@ DOCUMENTATION :: END
         clearSearchButton('export_table-RK-${data["rating_key"]}', export_table);
     }
 
-    $('a[href="#tabs-export"]').on('shown.bs.tab', function() {
+    $('#nav-tabs-export').on('shown.bs.tab', function() {
         if (typeof(export_table) === 'undefined') {
             loadExportTable();
         }
diff --git a/data/interfaces/default/library.html b/data/interfaces/default/library.html
index ff1cace5..e01d4519 100644
--- a/data/interfaces/default/library.html
+++ b/data/interfaces/default/library.html
@@ -88,16 +88,16 @@ DOCUMENTATION :: END
                             </div>
                             <div class="user-info-nav">
                                 <ul class="nav nav-list nav-pills" role="tablist">
-                                    <li class="active"><a href="#tabs-profile" role="tab" data-toggle="tab">Profile</a></li>
-                                    <li><a href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
+                                    <li class="active"><a id="nav-tabs-profile" href="#tabs-profile" role="tab" data-toggle="tab">Profile</a></li>
+                                    <li><a id="nav-tabs-history" href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
                                     % if data['section_id'] != LIVE_TV_SECTION_ID:
                                     % if _session['user_group'] == 'admin':
-                                    <li><a href="#tabs-mediainfo" role="tab" data-toggle="tab">Media Info</a></li>
+                                    <li><a id="nav-tabs-mediainfo" href="#tabs-mediainfo" role="tab" data-toggle="tab">Media Info</a></li>
                                     % endif
-                                    <li><a href="#tabs-collections" role="tab" data-toggle="tab">Collections</a></li>
-                                    <li><a href="#tabs-playlists" role="tab" data-toggle="tab">Playlists</a></li>
+                                    <li><a id="nav-tabs-collections" href="#tabs-collections" role="tab" data-toggle="tab">Collections</a></li>
+                                    <li><a id="nav-tabs-playlists" href="#tabs-playlists" role="tab" data-toggle="tab">Playlists</a></li>
                                     % if _session['user_group'] == 'admin':
-                                    <li><a href="#tabs-export" role="tab" data-toggle="tab">Export</a></li>
+                                    <li><a id="nav-tabs-export" href="#tabs-export" role="tab" data-toggle="tab">Export</a></li>
                                     % endif
                                     % endif
                                 </ul>
@@ -575,7 +575,7 @@ DOCUMENTATION :: END
         clearSearchButton('history_table-SID-${data["section_id"]}', history_table);
     }
 
-    $('a[href="#tabs-history"]').on('shown.bs.tab', function() {
+    $('#nav-tabs-history').on('shown.bs.tab', function() {
         if (typeof(history_table) === 'undefined') {
             loadHistoryTable();
         }
@@ -605,7 +605,7 @@ DOCUMENTATION :: END
         clearSearchButton('collections_table-SID-${data["section_id"]}', collections_table);
     }
 
-    $('a[href="#tabs-collections"]').on('shown.bs.tab', function() {
+    $('#nav-tabs-collections').on('shown.bs.tab', function() {
         if (typeof(collections_table) === 'undefined') {
             loadCollectionsTable();
         }
@@ -635,7 +635,7 @@ DOCUMENTATION :: END
         clearSearchButton('playlists_table-SID-${data["section_id"]}', playlists_table);
     }
 
-    $('a[href="#tabs-playlists"]').on('shown.bs.tab', function() {
+    $('#nav-tabs-playlists').on('shown.bs.tab', function() {
         if (typeof(playlists_table) === 'undefined') {
             loadPlaylistsTable();
         }
@@ -765,7 +765,7 @@ DOCUMENTATION :: END
         var hash = document.location.hash;
         var prefix = "tab_";
         if (hash) {
-            $('.nav-list a[href=' + hash.replace(prefix, "") + ']').tab('show').trigger('show.bs.tab');
+            $('.nav-list #nav-' + hash.replace('#' + prefix, "")).tab('show').trigger('show.bs.tab');
         }
 
         // Change hash for page-reload
@@ -818,7 +818,7 @@ DOCUMENTATION :: END
         clearSearchButton('media_info_table-SID-${data["section_id"]}', media_info_table);
     }
 
-    $('a[href="#tabs-mediainfo"]').on('shown.bs.tab', function() {
+    $('#nav-tabs-mediainfo').on('shown.bs.tab', function() {
         if (typeof(media_info_table) === 'undefined') {
             loadMediaInfoTable();
         }
@@ -853,7 +853,7 @@ DOCUMENTATION :: END
         clearSearchButton('export_table-SID-${data["section_id"]}', export_table);
     }
 
-    $('a[href="#tabs-export"]').on('shown.bs.tab', function() {
+    $('#nav-tabs-export').on('shown.bs.tab', function() {
         if (typeof(export_table) === 'undefined') {
             loadExportTable();
         }
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index d5efbbff..d4572dcf 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -46,17 +46,17 @@
         <!-- Nav tabs -->
         <div class="col-md-3">
             <ul class="nav-settings list-unstyled" role="tablist">
-                <li role="presentation" class="active"><a href="#tabs-help_info" aria-controls="tabs-help_info" role="tab" data-toggle="tab">Help & Info</a></li>
-                <li role="presentation"><a href="#tabs-general" aria-controls="tabs-general" role="tab" data-toggle="tab">General</a></li>
-                <li role="presentation"><a href="#tabs-homepage" aria-controls="tabs-homepage" role="tab" data-toggle="tab">Homepage</a></li>
-                <li role="presentation"><a href="#tabs-web_interface" aria-controls="tabs-web_interface" role="tab" data-toggle="tab">Web Interface</a></li>
-                <li role="presentation"><a href="#tabs-plex_media_server" aria-controls="tabs-plex_media_server" role="tab" data-toggle="tab">Plex Media Server</a></li>
-                <li role="presentation"><a href="#tabs-notifications" aria-controls="tabs-notifications" role="tab" data-toggle="tab">Notifications & Newsletters</a></li>
-                <li role="presentation"><a href="#tabs-notification_agents" aria-controls="tabs-notification_agents" role="tab" data-toggle="tab">Notification Agents</a></li>
-                <li role="presentation"><a href="#tabs-newsletter_agents" aria-controls="tabs-newsletter_agents" role="tab" data-toggle="tab">Newsletter Agents</a></li>
-                <li role="presentation"><a href="#tabs-3rd_party_apis" aria-controls="tabs-3rd_party_apis" role="tab" data-toggle="tab">3rd Party APIs</a></li>
-                <li role="presentation"><a href="#tabs-import_backups" aria-controls="tabs-import_backups" role="tab" data-toggle="tab">Import & Backups</a></li>
-                <li role="presentation"><a href="#tabs-android_app" aria-controls="tabs-android_app" role="tab" data-toggle="tab">Tautulli Remote Android App <sup><small>beta</small></sup></a></li>
+                <li role="presentation" class="active"><a id="nav-help_info" href="#tabs-help_info" aria-controls="tabs-help_info" role="tab" data-toggle="tab">Help & Info</a></li>
+                <li role="presentation"><a id="nav-tabs-general" href="#tabs-general" aria-controls="tabs-general" role="tab" data-toggle="tab">General</a></li>
+                <li role="presentation"><a id="nav-tabs-homepage" href="#tabs-homepage" aria-controls="tabs-homepage" role="tab" data-toggle="tab">Homepage</a></li>
+                <li role="presentation"><a id="nav-tabs-web_interface" href="#tabs-web_interface" aria-controls="tabs-web_interface" role="tab" data-toggle="tab">Web Interface</a></li>
+                <li role="presentation"><a id="nav-tabs-plex_media_server" href="#tabs-plex_media_server" aria-controls="tabs-plex_media_server" role="tab" data-toggle="tab">Plex Media Server</a></li>
+                <li role="presentation"><a id="nav-tabs-notifications" href="#tabs-notifications" aria-controls="tabs-notifications" role="tab" data-toggle="tab">Notifications & Newsletters</a></li>
+                <li role="presentation"><a id="nav-tabs-notification_agents" href="#tabs-notification_agents" aria-controls="tabs-notification_agents" role="tab" data-toggle="tab">Notification Agents</a></li>
+                <li role="presentation"><a id="nav-tabs-newsletter_agents" href="#tabs-newsletter_agents" aria-controls="tabs-newsletter_agents" role="tab" data-toggle="tab">Newsletter Agents</a></li>
+                <li role="presentation"><a id="nav-tabs-3rd_party_apis" href="#tabs-3rd_party_apis" aria-controls="tabs-3rd_party_apis" role="tab" data-toggle="tab">3rd Party APIs</a></li>
+                <li role="presentation"><a id="nav-tabs-import_backups" href="#tabs-import_backups" aria-controls="tabs-import_backups" role="tab" data-toggle="tab">Import & Backups</a></li>
+                <li role="presentation"><a id="nav-tabs-android_app" href="#tabs-android_app" aria-controls="tabs-android_app" role="tab" data-toggle="tab">Tautulli Remote Android App <sup><small>beta</small></sup></a></li>
             </ul>
         </div>
         <div class="col-md-9">
@@ -2153,9 +2153,9 @@ $(document).ready(function() {
 
     // Javascript to enable link to tab
     var hash = document.location.hash;
-    var prefix = "tab_";
+    var prefix = "tabs_";
     if (hash) {
-        $('.nav-settings a[href='+hash.replace(prefix,"")+']').tab('show');
+        $('.nav-settings #nav-' + hash.replace('#' + prefix, "")).tab('show');
     }
 
     // Change hash for page-reload
@@ -3047,7 +3047,7 @@ $(document).ready(function() {
     });
 
     function gotoSetting(tab, setting){
-        $("a[href=#tabs-" + tab + "]").click();
+        $("#nav-tabs-" + tab).click();
         if (setting) {
             _setting = '#' + setting;
             if ($(_setting).closest('.advanced-setting').length && !$('#menu_link_show_advanced_settings').hasClass('active')) {
diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html
index 3af32180..65e271d3 100644
--- a/data/interfaces/default/user.html
+++ b/data/interfaces/default/user.html
@@ -70,15 +70,15 @@ DOCUMENTATION :: END
                             </div>
                             <div class="user-info-nav">
                                 <ul class="nav nav-list nav-pills" role="tablist">
-                                    <li class="active"><a href="#tabs-profile" role="tab" data-toggle="tab">Profile</a></li>
-                                    <li><a href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
-                                    <li><a href="#tabs-playlists" role="tab" data-toggle="tab">Playlists</a></li>
+                                    <li class="active"><a id="nav-tabs-profile" href="#tabs-profile" role="tab" data-toggle="tab">Profile</a></li>
+                                    <li><a id="nav-tabs-history" href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
+                                    <li><a id="nav-tabs-playlists" href="#tabs-playlists" role="tab" data-toggle="tab">Playlists</a></li>
                                     % if _session['user_group'] == 'admin':
-                                    <li><a href="#tabs-export" role="tab" data-toggle="tab">Export</a></li>
+                                    <li><a id="nav-tabs-export" href="#tabs-export" role="tab" data-toggle="tab">Export</a></li>
                                     % endif
-                                    <li><a href="#tabs-synceditems" role="tab" data-toggle="tab">Synced Items</a></li>
-                                    <li><a href="#tabs-ipaddresses" role="tab" data-toggle="tab">IP Addresses</a></li>
-                                    <li><a href="#tabs-tautullilogins" role="tab" data-toggle="tab">Tautulli Logins</a></li>
+                                    <li><a id="nav-tabs-synceditems" href="#tabs-synceditems" role="tab" data-toggle="tab">Synced Items</a></li>
+                                    <li><a id="nav-tabs-ipaddresses" href="#tabs-ipaddresses" role="tab" data-toggle="tab">IP Addresses</a></li>
+                                    <li><a id="nav-tabs-tautullilogins" href="#tabs-tautullilogins" role="tab" data-toggle="tab">Tautulli Logins</a></li>
                                 </ul>
                             </div>
                         </div>
@@ -557,7 +557,7 @@ DOCUMENTATION :: END
         });
     }
 
-    $('a[href="#tabs-history"]').on('shown.bs.tab', function() {
+    $('#nav-tabs-history').on('shown.bs.tab', function() {
         if (typeof(history_table) === 'undefined') {
             var media_type = getLocalStorage('user_' + user_id + '-history_media_type', 'all');
             $('#history-' + media_type).prop('checked', true);
@@ -590,7 +590,7 @@ DOCUMENTATION :: END
         clearSearchButton('playlists_table-SID-${data["user_id"]}', playlists_table);
     }
 
-    $('a[href="#tabs-playlists"]').on('shown.bs.tab', function() {
+    $('#nav-tabs-playlists').on('shown.bs.tab', function() {
         if (typeof(playlists_table) === 'undefined') {
             loadPlaylistsTable();
         }
@@ -615,7 +615,7 @@ DOCUMENTATION :: END
         clearSearchButton('sync_table-UID-${data["user_id"]}', sync_table);
     }
 
-    $('a[href="#tabs-synceditems"]').on('shown.bs.tab', function() {
+    $('#nav-tabs-synceditems').on('shown.bs.tab', function() {
         if (typeof(sync_table) === 'undefined') {
             loadSyncTable(user_id);
         }
@@ -645,7 +645,7 @@ DOCUMENTATION :: END
         clearSearchButton('user_ip_table-UID-${data["user_id"]}', user_ip_table);
     }
 
-    $('a[href="#tabs-ipaddresses"]').on('shown.bs.tab', function() {
+    $('#nav-tabs-ipaddresses').on('shown.bs.tab', function() {
         if (typeof(user_ip_table) === 'undefined') {
             loadIPAddressTable(user_id);
         }
@@ -676,7 +676,7 @@ DOCUMENTATION :: END
         clearSearchButton('login_log_table-UID-${data["user_id"]}', login_log_table);
     }
 
-    $('a[href="#tabs-tautullilogins"]').on('shown.bs.tab', function() {
+    $('#nav-tabs-tautullilogins').on('shown.bs.tab', function() {
         if (typeof(login_log_table) === 'undefined') {
             loadLoginTable(user_id);
         }
@@ -744,12 +744,11 @@ DOCUMENTATION :: END
     });
 
     $(document).ready(function () {
-
         // Javascript to enable link to tab
         var hash = document.location.hash;
         var prefix = "tab_";
         if (hash) {
-            $('.nav-list a[href=' + hash.replace(prefix, "") + ']').tab('show').trigger('show.bs.tab');
+            $('.nav-list #nav-' + hash.replace('#' + prefix, "")).tab('show').trigger('show.bs.tab');
         }
 
         // Change hash for page-reload
@@ -802,7 +801,7 @@ DOCUMENTATION :: END
         clearSearchButton('export_table-SID-${data["user_id"]}', export_table);
     }
 
-    $('a[href="#tabs-export"]').on('shown.bs.tab', function() {
+    $('#nav-tabs-export').on('shown.bs.tab', function() {
         if (typeof(export_table) === 'undefined') {
             loadExportTable();
         }