diff --git a/dashboard-ui/scripts/userparentalcontrol.js b/dashboard-ui/scripts/userparentalcontrol.js
index 83cc2b209d..b6f2e6b772 100644
--- a/dashboard-ui/scripts/userparentalcontrol.js
+++ b/dashboard-ui/scripts/userparentalcontrol.js
@@ -61,6 +61,13 @@
         $('#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();
     }
@@ -80,6 +87,13 @@
 
         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();
+
         ApiClient.updateUser(user).done(function () {
             onSaveComplete(page);
         });
@@ -137,8 +151,6 @@
             loadUser(page, response1[0] || response1, response2[0], response3[0]);
 
         });
-
-        $("form input:first", page).focus();
     });
 
 })(jQuery, window, document);
\ No newline at end of file
diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html
index 414fdb5f8f..01c6fb9fed 100644
--- a/dashboard-ui/userparentalcontrol.html
+++ b/dashboard-ui/userparentalcontrol.html
@@ -16,17 +16,45 @@
                     <a href="#" data-role="button" onclick="Dashboard.navigate('usersettings.html', true);">Preferences</a>
                 </div>
                 <form class="userParentalControlForm">
-                    
+
+
                     <ul data-role="listview" class="ulForm">
                         <li>
                             <label for="selectMaxParentalRating">Maximum allowed parental rating:</label>
                             <select name="selectMaxParentalRating" id="selectMaxParentalRating"></select>
-                        </li>
-                        <li>
-                            <input type="checkbox" id="chkBlockNotRated" name="chkBlockNotRated" />
-                            <label for="chkBlockNotRated">Hide content with no rating information</label>
+                            <div class="fieldDescription">Content with a higher rating will be hidden from this user.</div>
                         </li>
                     </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>
+                    <br />
+                    <br />
                     <ul data-role="listview" class="ulForm">
                         <li>
                             <button type="submit" data-theme="b" data-icon="check">