diff --git a/dashboard-ui/legacy/fnchecked.js b/dashboard-ui/legacy/fnchecked.js
index 2a88682a57..f4e61982d2 100644
--- a/dashboard-ui/legacy/fnchecked.js
+++ b/dashboard-ui/legacy/fnchecked.js
@@ -1,12 +1,15 @@
-// TODO: This needs to be deprecated, but it's used heavily
-$.fn.checked = function (value) {
-    if (value === true || value === false) {
-        // Set the value of the checkbox
-        return $(this).each(function () {
-            this.checked = value;
-        });
-    } else {
-        // Return check state
-        return this.length && this[0].checked;
-    }
-};
\ No newline at end of file
+define(['jQuery'], function ($) {
+
+    // TODO: This needs to be deprecated, but it's used heavily
+    $.fn.checked = function (value) {
+        if (value === true || value === false) {
+            // Set the value of the checkbox
+            return $(this).each(function () {
+                this.checked = value;
+            });
+        } else {
+            // Return check state
+            return this.length && this[0].checked;
+        }
+    };
+});
\ No newline at end of file
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index f0a3626d52..f9ab6f1266 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1495,13 +1495,15 @@ var AppInfo = {};
 
         define("jQuery", [bowerPath + '/jquery/dist/jquery.slim.min'], function () {
 
-            require(['legacy/fnchecked']);
+            require(['fnchecked']);
             if (window.ApiClient) {
                 jQuery.ajax = ApiClient.ajax;
             }
             return jQuery;
         });
 
+        define("fnchecked", ['legacy/fnchecked']);
+
         define("dialogHelper", [embyWebComponentsBowerPath + "/dialoghelper/dialoghelper"], function (dialoghelper) {
 
             dialoghelper.setOnOpen(onDialogOpen);
diff --git a/dashboard-ui/scripts/usernew.js b/dashboard-ui/scripts/usernew.js
index 1e4610d75c..2efd3d4a54 100644
--- a/dashboard-ui/scripts/usernew.js
+++ b/dashboard-ui/scripts/usernew.js
@@ -1,12 +1,12 @@
-define(['jQuery'], function ($) {
+define(['jQuery', 'fnchecked', 'emby-checkbox'], function ($) {
 
     function loadMediaFolders(page, mediaFolders) {
 
         var html = '';
 
-        html += '<div class="paperListLabel">' + Globalize.translate('HeaderLibraries') + '</div>';
+        html += '<h3 class="checkboxListLabel">' + Globalize.translate('HeaderLibraries') + '</h3>';
 
-        html += '<div class="paperCheckboxList paperList" style="padding:.5em 1em;">';
+        html += '<div class="checkboxList paperList" style="padding:.5em 1em;">';
 
         for (var i = 0, length = mediaFolders.length; i < length; i++) {
 
@@ -14,7 +14,7 @@
 
             var checkedAttribute = ' checked="checked"';
 
-            html += '<paper-checkbox class="chkFolder" data-id="' + folder.Id + '"' + checkedAttribute + '>' + folder.Name + '</paper-checkbox>';
+            html += '<label><input type="checkbox" is="emby-checkbox" class="chkFolder" data-id="' + folder.Id + '"' + checkedAttribute + '/><span>' + folder.Name + '</span></label>';
         }
 
         html += '</div>';
@@ -28,9 +28,9 @@
 
         var html = '';
 
-        html += '<div class="paperListLabel">' + Globalize.translate('HeaderChannels') + '</div>';
+        html += '<h3 class="checkboxListLabel">' + Globalize.translate('HeaderChannels') + '</h3>';
 
-        html += '<div class="paperCheckboxList paperList" style="padding:.5em 1em;">';
+        html += '<div class="checkboxList paperList" style="padding:.5em 1em;">';
 
         for (var i = 0, length = channels.length; i < length; i++) {
 
@@ -38,7 +38,7 @@
 
             var checkedAttribute = ' checked="checked"';
 
-            html += '<paper-checkbox class="chkChannel" data-id="' + folder.Id + '"' + checkedAttribute + '>' + folder.Name + '</paper-checkbox>';
+            html += '<label><input type="checkbox" is="emby-checkbox" class="chkChannel" data-id="' + folder.Id + '"' + checkedAttribute + '/><span>' + folder.Name + '</span></label>';
         }
 
         html += '</div>';
diff --git a/dashboard-ui/usernew.html b/dashboard-ui/usernew.html
index faecd6d009..02547da144 100644
--- a/dashboard-ui/usernew.html
+++ b/dashboard-ui/usernew.html
@@ -1,4 +1,4 @@
-<div id="newUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmlistview,scripts/usernew,emby-input,paper-checkbox,emby-button">
+<div id="newUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/usernew,emby-input,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -11,40 +11,39 @@
 
                 <div class="folderAccessContainer">
                     <h1>${HeaderLibraryAccess}</h1>
-                    <div>
-                        <paper-checkbox id="chkEnableAllFolders">${OptionEnableAccessToAllLibraries}</paper-checkbox>
+                    <div class="checkboxContainer checkboxContainer-withDescription">
+                        <label>
+                            <input type="checkbox" is="emby-checkbox" id="chkEnableAllFolders" />
+                            <span>${OptionEnableAccessToAllLibraries}</span>
+                        </label>
                         <div class="fieldDescription paperCheckboxFieldDescription">${LibraryAccessHelp}</div>
                     </div>
                     <div class="folderAccessListContainer">
-                        <br />
                         <div class="folderAccess">
                         </div>
                     </div>
                 </div>
-                <br />
-                <br />
                 <div class="channelAccessContainer" style="display:none;">
                     <h1>${HeaderChannelAccess}</h1>
-                    <div>
-                        <paper-checkbox id="chkEnableAllChannels">${OptionEnableAccessToAllChannels}</paper-checkbox>
+                    <div class="checkboxContainer checkboxContainer-withDescription">
+                        <label>
+                            <input type="checkbox" is="emby-checkbox" id="chkEnableAllChannels" />
+                            <span>${OptionEnableAccessToAllChannels}</span>
+                        </label>
                         <div class="fieldDescription paperCheckboxFieldDescription">${ChannelAccessHelp}</div>
                     </div>
                     <div class="channelAccessListContainer">
-                        <br />
                         <div class="channelAccess">
                         </div>
                     </div>
                 </div>
 
                 <br />
-                <br />
-                <ul data-role="listview" class="ulForm">
-                    <li>
-                        <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                <div>
+                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
-                        <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
-                    </li>
-                </ul>
+                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
+                </div>
             </form>
         </div>
     </div>