diff --git a/dashboard-ui/scripts/userparentalcontrol.js b/dashboard-ui/scripts/userparentalcontrol.js
index c6752e3ba6..af859e8b38 100644
--- a/dashboard-ui/scripts/userparentalcontrol.js
+++ b/dashboard-ui/scripts/userparentalcontrol.js
@@ -63,11 +63,49 @@
         $('.libraryAccess', page).html(html).trigger('create');
     }
 
+    function loadUnratedItems(page, user) {
+
+        var items = [
+            { name: 'Books', value: 'Book' },
+            { name: 'Games', value: 'Game' },
+            { name: 'Live TV Channels', value: 'LiveTvChannel' },
+            { name: 'Live TV Programs', value: 'LiveTvProgram' },
+            { name: 'Movies', value: 'Movie' },
+            { name: 'Music', value: 'Music' },
+            { name: 'Others', value: 'Other' },
+            { name: 'Trailers', value: 'Trailer' },
+            { name: 'TV Shows', value: 'Series' }
+        ];
+
+        var html = '';
+
+        html += '<fieldset data-role="controlgroup">';
+
+        html += '<legend>Block items with no rating information:</legend>';
+
+        for (var i = 0, length = items.length; i < length; i++) {
+
+            var item = items[i];
+
+            var id = 'unratedItem' + i;
+
+            var checkedAttribute = user.Configuration.BlockUnratedItems.indexOf(item.value) != -1 ? ' checked="checked"' : '';
+
+            html += '<input class="chkUnratedItem" data-itemtype="' + item.value + '" type="checkbox" data-mini="true" id="' + id + '"' + checkedAttribute + ' />';
+            html += '<label for="' + id + '">' + item.name + '</label>';
+        }
+
+        html += '</fieldset>';
+
+        $('.blockUnratedItems', page).html(html).trigger('create');
+    }
+
     function loadUser(page, user, loggedInUser, allParentalRatings, mediaFolders) {
 
         Dashboard.setPageTitle(user.Name);
 
         loadMediaFolders(page, user, mediaFolders);
+        loadUnratedItems(page, user);
 
         populateRatings(allParentalRatings, page);
 
@@ -87,15 +125,6 @@
 
         $('#selectMaxParentalRating', page).val(ratingValue).selectmenu("refresh");
 
-        $('#chkBlockNotRated', page).checked(user.Configuration.BlockNotRated || false).checkboxradio("refresh");
-
-        $('#chkHideUnratedMovies', page).checked(user.Configuration.BlockUnratedMovies || false).checkboxradio("refresh");
-        $('#chkHideUnratedTrailers', page).checked(user.Configuration.BlockUnratedTrailers || false).checkboxradio("refresh");
-        $('#chkHideUnratedSeries', page).checked(user.Configuration.BlockUnratedSeries || false).checkboxradio("refresh");
-        $('#chkHideUnratedMusic', page).checked(user.Configuration.BlockUnratedMusic || false).checkboxradio("refresh");
-        $('#chkHideUnratedGames', page).checked(user.Configuration.BlockUnratedGames || false).checkboxradio("refresh");
-        $('#chkHideUnratedBooks', page).checked(user.Configuration.BlockUnratedBooks || false).checkboxradio("refresh");
-
         Dashboard.hideLoadingMsg();
     }
 
@@ -112,21 +141,18 @@
 
         user.Configuration.MaxParentalRating = $('#selectMaxParentalRating', page).val() || null;
 
-        user.Configuration.BlockNotRated = $('#chkBlockNotRated', page).checked();
-
-        user.Configuration.BlockUnratedMovies = $('#chkHideUnratedMovies', page).checked();
-        user.Configuration.BlockUnratedTrailers = $('#chkHideUnratedTrailers', page).checked();
-        user.Configuration.BlockUnratedSeries = $('#chkHideUnratedSeries', page).checked();
-        user.Configuration.BlockUnratedMusic = $('#chkHideUnratedMusic', page).checked();
-        user.Configuration.BlockUnratedGames = $('#chkHideUnratedGames', page).checked();
-        user.Configuration.BlockUnratedBooks = $('#chkHideUnratedBooks', page).checked();
-
         user.Configuration.BlockedMediaFolders = $('.chkMediaFolder:not(:checked)', page).map(function () {
 
             return this.getAttribute('data-foldername');
 
         }).get();
 
+        user.Configuration.BlockUnratedItems = $('.chkUnratedItem:checked', page).map(function () {
+
+            return this.getAttribute('data-itemtype');
+
+        }).get();
+
         ApiClient.updateUser(user).done(function () {
             onSaveComplete(page);
         });
diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html
index fcd75d1af8..4bc1d179cf 100644
--- a/dashboard-ui/userparentalcontrol.html
+++ b/dashboard-ui/userparentalcontrol.html
@@ -33,30 +33,8 @@
                     </ul>
 
                     <div>
-                        <fieldset data-role="controlgroup">
-                            <legend>Hide content with no rating information</legend>
-
-                            <input type="checkbox" data-mini="true" id="chkHideUnratedBooks" name="chkHideUnratedBooks" />
-                            <label for="chkHideUnratedBooks">Books</label>
-
-                            <input type="checkbox" data-mini="true" id="chkHideUnratedGames" name="chkHideUnratedGames" />
-                            <label for="chkHideUnratedGames">Games</label>
-
-                            <input type="checkbox" data-mini="true" id="chkHideUnratedMovies" name="chkHideUnratedMovies" />
-                            <label for="chkHideUnratedMovies">Movies</label>
-
-                            <input type="checkbox" data-mini="true" id="chkHideUnratedMusic" name="chkHideUnratedMusic" />
-                            <label for="chkHideUnratedMusic">Music</label>
-
-                            <input type="checkbox" data-mini="true" id="chkHideUnratedTrailers" name="chkHideUnratedTrailers" />
-                            <label for="chkHideUnratedTrailers">Trailers</label>
-
-                            <input type="checkbox" data-mini="true" id="chkHideUnratedSeries" name="chkHideUnratedSeries" />
-                            <label for="chkHideUnratedSeries">TV Shows</label>
-
-                            <input type="checkbox" data-mini="true" id="chkBlockNotRated" name="chkBlockNotRated" />
-                            <label for="chkBlockNotRated">Other Items</label>
-                        </fieldset>
+                        <div class="blockUnratedItems">
+                        </div>
 
                     </div>
                     <br />