diff --git a/dashboard-ui/components/guestinviter/guestinviter.js b/dashboard-ui/components/guestinviter/guestinviter.js
index 5e2f37d70..ebf02b217 100644
--- a/dashboard-ui/components/guestinviter/guestinviter.js
+++ b/dashboard-ui/components/guestinviter/guestinviter.js
@@ -1,4 +1,4 @@
-define(['dialogHelper', 'jQuery', 'paper-input', 'paper-button', 'emby-collapsible', 'paper-checkbox', 'paper-icon-button-light'], function (dialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'emby-input', 'paper-button', 'emby-collapsible', 'paper-checkbox', 'paper-icon-button-light'], function (dialogHelper, $) {
 
     function renderLibrarySharingList(context, result) {
 
diff --git a/dashboard-ui/components/guestinviter/guestinviter.template.html b/dashboard-ui/components/guestinviter/guestinviter.template.html
index ca896ea6c..93d050889 100644
--- a/dashboard-ui/components/guestinviter/guestinviter.template.html
+++ b/dashboard-ui/components/guestinviter/guestinviter.template.html
@@ -7,10 +7,12 @@
 
 <form class="addUserForm" style="max-width: none;margin:0;">
 
-    <paper-input type="text" id="txtConnectUsername" value="" placeholder="${PlaceholderUsername}" label="${LabelConnectGuestUserName}" required></paper-input>
-    <div class="fieldDescription">
-        <div>${LabelConnectGuestUserNameHelp}</div>
-        <div style="margin-top: .25em;"><a href="http://emby.media/connect" target="_blank">${ButtonLearnMoreAboutEmbyConnect}</a></div>
+    <div class="inputContainer">
+        <input is="emby-input" type="text" id="txtConnectUsername" value="" label="${LabelConnectGuestUserName}" required />
+        <div class="fieldDescription">
+            <div>${LabelConnectGuestUserNameHelp}</div>
+            <div style="margin-top: .25em;"><a href="http://emby.media/connect" target="_blank">${ButtonLearnMoreAboutEmbyConnect}</a></div>
+        </div>
     </div>
 
     <br />
diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
index 0eb86f42a..7117ed15e 100644
--- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
+++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
@@ -1,4 +1,4 @@
-define(['dialogHelper', 'jQuery', 'paper-input', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'paper-icon-button-light'], function (dialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'emby-input', 'emby-select', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'paper-icon-button-light'], function (dialogHelper, $) {
 
     var currentDeferred;
     var hasChanges;
diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
index cdd7d021d..1e4f74d7c 100644
--- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
+++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
@@ -6,16 +6,14 @@
 </div>
 
 <form style="margin:auto;">
-    <div id="fldCollectionType">
-        <label for="selectCollectionType">${LabelContentType}</label>
-        <select id="selectCollectionType" data-mini="true" required="required"></select>
+    <div id="fldCollectionType" class="selectContainer">
+        <select is="emby-select" id="selectCollectionType" data-mini="true" required="required" label="${LabelContentType}"></select>
         <div class="collectionTypeFieldDescription fieldDescription">
         </div>
     </div>
-    <div>
-        <paper-input type="text" id="txtValue" required="required" label="${LabelDisplayName}"></paper-input>
+    <div class="inputContainer">
+        <input is="emby-input" type="text" id="txtValue" required="required" label="${LabelDisplayName}" />
     </div>
-    <br />
     <div>
         <h1 style="display:inline-block;vertical-align:middle;">${HeadersFolders}</h1>
         <paper-button raised class="btnAddFolder submit mini" style="margin-left:1em;" title="${ButtonAdd}">
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 4f89cfe34..f97f2c22c 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -3045,7 +3045,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/wizarduser.html',
-            dependencies: ['dashboardcss'],
+            dependencies: ['dashboardcss', 'emby-input'],
             autoFocus: false,
             anonymous: true
         });
diff --git a/dashboard-ui/usernew.html b/dashboard-ui/usernew.html
index c5f22bcd1..88992c5ab 100644
--- a/dashboard-ui/usernew.html
+++ b/dashboard-ui/usernew.html
@@ -1,15 +1,13 @@
-<div id="newUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/usernew,paper-input,paper-checkbox,paper-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,paper-checkbox,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
 
             <form class="newUserProfileForm">
-                <ul data-role="listview" class="ulForm">
-                    <li id="fldUserName">
-                        <paper-input id="txtUserName" required type="text" label="${LabelName}"></paper-input>
-                        <div class="fieldDescription labelNewUserNameHelp">${LabelNewUserNameHelp}</div>
-                    </li>
-                </ul>
+                <div class="inputContainer">
+                    <input is="emby-input" id="txtUserName" required type="text" label="${LabelName}" />
+                    <div class="fieldDescription labelNewUserNameHelp">${LabelNewUserNameHelp}</div>
+                </div>
 
                 <div class="folderAccessContainer">
                     <h1>${HeaderLibraryAccess}</h1>
diff --git a/dashboard-ui/userpassword.html b/dashboard-ui/userpassword.html
index 6e5365829..4ac5fc220 100644
--- a/dashboard-ui/userpassword.html
+++ b/dashboard-ui/userpassword.html
@@ -1,4 +1,4 @@
-<div id="userPasswordPage" data-role="page" class="page type-interior userProfilesPage userPasswordPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/myprofile,scripts/userpassword,paper-checkbox,paper-input,paper-button">
+<div id="userPasswordPage" data-role="page" class="page type-interior userProfilesPage userPasswordPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/myprofile,scripts/userpassword,paper-checkbox,emby-input,paper-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -20,16 +20,14 @@
 
                     <div class="detailSection">
                         <div class="detailSectionContent">
-                            <div id="fldCurrentPassword" style="display: none;">
-                                <paper-input type="password" id="txtCurrentPassword" label="${LabelCurrentPassword}" autocomplete="off"></paper-input>
+                            <div id="fldCurrentPassword" style="display: none;" class="inputContainer">
+                                <input is="emby-input" type="password" id="txtCurrentPassword" label="${LabelCurrentPassword}" autocomplete="off"/>
                             </div>
-                            <br />
-                            <div>
-                                <paper-input type="password" id="txtNewPassword" label="${LabelNewPassword}" autocomplete="off"></paper-input>
+                            <div class="inputContainer">
+                                <input is="emby-input" type="password" id="txtNewPassword" label="${LabelNewPassword}" autocomplete="off"/>
                             </div>
-                            <br />
-                            <div>
-                                <paper-input type="password" id="txtNewPasswordConfirm" label="${LabelNewPasswordConfirm}" autocomplete="off"></paper-input>
+                            <div class="inputContainer">
+                                <input is="emby-input" type="password" id="txtNewPasswordConfirm" label="${LabelNewPasswordConfirm}" autocomplete="off" />
                             </div>
                             <br />
                             <div>
@@ -53,8 +51,8 @@
                             <br />
                             <div>${EasyPasswordHelp}</div>
                             <br />
-                            <div>
-                                <paper-input type="number" id="txtEasyPassword" label="${LabelEasyPinCode}" autocomplete="off" pattern="[0-9]*" step="1" maxlength="5"></paper-input>
+                            <div class="inputContainer">
+                                <input is="emby-input" type="number" id="txtEasyPassword" label="${LabelEasyPinCode}" autocomplete="off" pattern="[0-9]*" step="1" maxlength="5" />
                             </div>
                             <br />
                             <div>
diff --git a/dashboard-ui/wizarduser.html b/dashboard-ui/wizarduser.html
index 2a104f59a..2eb290430 100644
--- a/dashboard-ui/wizarduser.html
+++ b/dashboard-ui/wizarduser.html
@@ -9,22 +9,20 @@
                 </h1>
 
                 <p style="margin-top:2em;">${UserProfilesIntro}</p>
-
-                <div>
-                    <paper-input type="text" id="txtUsername" label="${LabelYourFirstName}" required="required"></paper-input>
+                <br />
+                <div class="inputContainer">
+                    <input is="emby-input" type="text" id="txtUsername" label="${LabelYourFirstName}" required="required" />
                     <div class="fieldDescription">${MoreUsersCanBeAddedLater}</div>
                 </div>
-                <br />
-                <h1 style="margin-bottom:.25em;">${HeaderOptionalLinkEmbyAccount}</h1>
-                <div>
-                    <paper-input type="text" id="txtConnectUserName" label="${LabelConnectUserName}"></paper-input>
+                <br />   <h1 style="margin-bottom:.25em;">${HeaderOptionalLinkEmbyAccount}</h1>
+                <br /> <div class="inputContainer">
+                    <input is="emby-input" type="text" id="txtConnectUserName" label="${LabelConnectUserName}" />
                     <div class="fieldDescription">
                         <div>${LabelConnectUserNameHelp}</div>
                         <div style="margin-top: .7em;"><a href="http://emby.media/connect" target="_blank">${ButtonLearnMoreAboutEmbyConnect}</a></div>
                     </div>
                 </div>
                 <br />
-                <br />
                 <div class="wizardNavigation">
                     <button type="button" data-role="none" class="clearButton" style="width:auto;"><paper-button raised class="subdued"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></paper-button></button>
                     <button type="submit" data-role="none" class="clearButton" style="width:auto;"><paper-button raised class="accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></paper-button></button>