diff --git a/dashboard-ui/playlistedit.html b/dashboard-ui/playlistedit.html
index 643e784b56..feb02d8fe3 100644
--- a/dashboard-ui/playlistedit.html
+++ b/dashboard-ui/playlistedit.html
@@ -11,6 +11,7 @@
         </div>
 
         <div data-role="content">
+            <h2 style="text-align:center;" class="playlistName"></h2>
             <div class="viewSettings">
                 <div class="listTopPaging">
                     &nbsp;
diff --git a/dashboard-ui/scripts/playlistedit.js b/dashboard-ui/scripts/playlistedit.js
index 0570090a74..a22ccf57fc 100644
--- a/dashboard-ui/scripts/playlistedit.js
+++ b/dashboard-ui/scripts/playlistedit.js
@@ -53,6 +53,8 @@
             var user = response2[0];
             var item = response3[0];
 
+            $('.playlistName', page).html(item.Name);
+
             _childrenItemsFunction = getItemsFunction(query);
 
             currentItem = item;
diff --git a/dashboard-ui/scripts/syncsettings.js b/dashboard-ui/scripts/syncsettings.js
index 3ceff3da7d..d75cc826d2 100644
--- a/dashboard-ui/scripts/syncsettings.js
+++ b/dashboard-ui/scripts/syncsettings.js
@@ -3,6 +3,7 @@
     function loadPage(page, config) {
 
         $('#txtSyncTempPath', page).val(config.TemporaryPath || '');
+        $('#txtUploadSpeedLimit', page).val(config.UploadSpeedLimitBytes / 1000000);
 
         Dashboard.hideLoadingMsg();
     }
@@ -51,6 +52,7 @@
             ApiClient.getNamedConfiguration("sync").done(function (config) {
 
                 config.TemporaryPath = $('#txtSyncTempPath', form).val();
+                config.UploadSpeedLimitBytes = parseInt(parseFloat(($('#txtUploadSpeedLimit', form).val() || '0')) * 1000000);
 
                 ApiClient.updateNamedConfiguration("sync", config).done(Dashboard.processServerConfigurationUpdateResult);
             });
diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js
index 58e1394e2d..ea394ee274 100644
--- a/dashboard-ui/scripts/useredit.js
+++ b/dashboard-ui/scripts/useredit.js
@@ -34,7 +34,6 @@
         $('#chkRemoteControlSharedDevices', page).checked(user.Policy.EnableSharedDeviceControl).checkboxradio("refresh");
         $('#chkEnableRemoteControlOtherUsers', page).checked(user.Policy.EnableRemoteControlOfOtherUsers).checkboxradio("refresh");
 
-        $('#chkEnableMediaPlayback', page).checked(user.Policy.EnableMediaPlayback).checkboxradio("refresh");
         $('#chkEnableDownloading', page).checked(user.Policy.EnableContentDownloading).checkboxradio("refresh");
 
         $('#chkManageLiveTv', page).checked(user.Policy.EnableLiveTvManagement).checkboxradio("refresh");
@@ -43,7 +42,11 @@
 
         $('#chkDisableUserPreferences', page).checked((!user.Policy.EnableUserPreferenceAccess)).checkboxradio("refresh");
 
+        $('#chkEnableMediaPlayback', page).checked(user.Policy.EnableMediaPlayback).checkboxradio("refresh");
+        $('#chkEnableMediaPlaybackTranscoding', page).checked(user.Policy.EnableMediaPlaybackTranscoding).checkboxradio("refresh");
+
         $('#chkEnableSync', page).checked(user.Policy.EnableSync).checkboxradio("refresh");
+        $('#chkEnableSyncTranscoding', page).checked(user.Policy.EnableSyncTranscoding).checkboxradio("refresh");
 
         Dashboard.hideLoadingMsg();
     }
@@ -82,9 +85,12 @@
         user.Policy.EnableSharedDeviceControl = $('#chkRemoteControlSharedDevices', page).checked();
 
         user.Policy.EnableMediaPlayback = $('#chkEnableMediaPlayback', page).checked();
+        user.Policy.EnableMediaPlaybackTranscoding = $('#chkEnableMediaPlaybackTranscoding', page).checked();
+
         user.Policy.EnableContentDownloading = $('#chkEnableDownloading', page).checked();
 
         user.Policy.EnableSync = $('#chkEnableSync', page).checked();
+        user.Policy.EnableSyncTranscoding = $('#chkEnableSyncTranscoding', page).checked();
 
         ApiClient.updateUser(user).done(function () {
 
diff --git a/dashboard-ui/syncsettings.html b/dashboard-ui/syncsettings.html
index 3ff152dab9..9ae3e06036 100644
--- a/dashboard-ui/syncsettings.html
+++ b/dashboard-ui/syncsettings.html
@@ -28,11 +28,15 @@
                                 ${LabelSyncTempPathHelp}
                             </div>
                         </li>
+                        <li>
+                            <label for="txtUploadRateLimit">${LabelUploadSpeedLimit}</label>
+                            <input type="number" id="txtUploadSpeedLimit" min="0" step=".5" required="required" />
+                        </li>
                     </ul>
 
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <button type="submit" data-theme="b" data-icon="check" data-mini="true">
+                            <button type="submit" data-theme="b" data-icon="check">
                                 ${ButtonSave}
                             </button>
                         </li>
diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html
index 564cfe8443..ec4e515df9 100644
--- a/dashboard-ui/useredit.html
+++ b/dashboard-ui/useredit.html
@@ -18,7 +18,7 @@
                 <p class="lnkEditUserPreferencesContainer">
                     <a class="lnkEditUserPreferences" href="#" target="_blank">${ButtonEditOtherUserPreferences}</a>
                 </p>
-                <br/>
+                <br />
                 <form id="editUserProfileForm">
 
                     <div class="disabledUserBanner" style="display:none;">
@@ -57,18 +57,26 @@
                         <label for="chkEnableContentDeletion">${OptionAllowDeleteLibraryContent}</label>
                         <input type="checkbox" id="chkEnableDownloading" />
                         <label for="chkEnableDownloading">${OptionAllowContentDownloading}</label>
-                        <input type="checkbox" id="chkEnableMediaPlayback" name="chkEnableMediaPlayback" />
-                        <label for="chkEnableMediaPlayback">${OptionAllowMediaPlayback}</label>
                         <input type="checkbox" id="chkEnableLiveTvAccess" name="chkEnableLiveTvAccess" />
                         <label for="chkEnableLiveTvAccess">${OptionAllowBrowsingLiveTv}</label>
                         <input type="checkbox" id="chkManageLiveTv" name="chkManageLiveTv" />
                         <label for="chkManageLiveTv">${OptionAllowManageLiveTv}</label>
-                        <input type="checkbox" id="chkEnableSync" />
-                        <label for="chkEnableSync">${OptionAllowSyncContent}</label>
                     </fieldset>
                     <br />
                     <div>
-                        <fieldset id="remoteControlFields" data-role="controlgroup">
+                        <fieldset data-role="controlgroup">
+                            <legend>${HeaderPlayback}</legend>
+                            <input type="checkbox" id="chkEnableMediaPlayback" />
+                            <label for="chkEnableMediaPlayback">${OptionAllowMediaPlayback}</label>
+                            <input type="checkbox" id="chkEnableMediaPlaybackTranscoding" />
+                            <label for="chkEnableMediaPlaybackTranscoding">${OptionAllowMediaPlaybackTranscoding}</label>
+                        </fieldset>
+                        <div class="fieldDescription">${OptionAllowMediaPlaybackTranscodingHelp}</div>
+                        <br />
+                    </div>
+                    <br />
+                    <div>
+                        <fieldset data-role="controlgroup">
                             <legend>${HeaderRemoteControl}</legend>
                             <input type="checkbox" id="chkEnableRemoteControlOtherUsers" name="chkEnableRemoteControlOtherUsers" />
                             <label for="chkEnableRemoteControlOtherUsers">${OptionAllowRemoteControlOthers}</label>
@@ -78,6 +86,17 @@
                         <div class="fieldDescription">${OptionAllowRemoteSharedDevicesHelp}</div>
                         <br />
                     </div>
+                    <br />
+                    <div>
+                        <fieldset data-role="controlgroup">
+                            <legend>${HeaderSync}</legend>
+                            <input type="checkbox" id="chkEnableSync" />
+                            <label for="chkEnableSync">${OptionAllowSyncContent}</label>
+                            <input type="checkbox" id="chkEnableSyncTranscoding" />
+                            <label for="chkEnableSyncTranscoding">${OptionAllowSyncTranscoding}</label>
+                        </fieldset>
+                        <br />
+                    </div>
                     <div id="fldIsEnabled" style="margin: 1em 0 2em;">
                         <div data-role="controlgroup">
                             <input type="checkbox" id="chkDisabled" name="chkDisabled" />
@@ -101,7 +120,7 @@
                     <br />
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <button type="submit" data-theme="b" data-icon="check" data-mini="true">
+                            <button type="submit" data-theme="b" data-icon="check">
                                 ${ButtonSave}
                             </button>
                         </li>