diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js
index c4888c519e..661b61216f 100644
--- a/dashboard-ui/scripts/useredit.js
+++ b/dashboard-ui/scripts/useredit.js
@@ -45,6 +45,7 @@
         $('#chkEnableMediaPlayback', page).checked(user.Policy.EnableMediaPlayback);
         $('#chkEnableAudioPlaybackTranscoding', page).checked(user.Policy.EnableAudioPlaybackTranscoding);
         $('#chkEnableVideoPlaybackTranscoding', page).checked(user.Policy.EnableVideoPlaybackTranscoding);
+        $('#chkEnableVideoPlaybackRemuxing', page).checked(user.Policy.EnablePlaybackRemuxing);
 
         $('#chkEnableSync', page).checked(user.Policy.EnableSync);
         $('#chkEnableSyncTranscoding', page).checked(user.Policy.EnableSyncTranscoding);
@@ -186,6 +187,7 @@
         user.Policy.EnableMediaPlayback = $('#chkEnableMediaPlayback', page).checked();
         user.Policy.EnableAudioPlaybackTranscoding = $('#chkEnableAudioPlaybackTranscoding', page).checked();
         user.Policy.EnableVideoPlaybackTranscoding = $('#chkEnableVideoPlaybackTranscoding', page).checked();
+        user.Policy.EnablePlaybackRemuxing = $('#chkEnableVideoPlaybackRemuxing', page).checked();
 
         user.Policy.EnableContentDownloading = $('#chkEnableDownloading', page).checked();
 
diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json
index 4797dd4543..365737007a 100644
--- a/dashboard-ui/strings/en-US.json
+++ b/dashboard-ui/strings/en-US.json
@@ -1349,6 +1349,7 @@
   "HeaderPlayback": "Media Playback",
   "OptionAllowAudioPlaybackTranscoding": "Allow audio playback that requires transcoding",
   "OptionAllowVideoPlaybackTranscoding": "Allow video playback that requires transcoding",
+  "OptionAllowVideoPlaybackRemuxing": "Allow video playback that requires conversion without re-encoding",
   "OptionAllowMediaPlaybackTranscodingHelp": "Users will receive friendly messages when content is unplayable based on policy.",
   "TabStreaming": "Streaming",
   "LabelRemoteClientBitrateLimit": "Internet streaming bitrate limit (Mbps):",
diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html
index 79995da83f..c9e993053b 100644
--- a/dashboard-ui/useredit.html
+++ b/dashboard-ui/useredit.html
@@ -63,6 +63,7 @@
                         <paper-checkbox id="chkEnableMediaPlayback">${OptionAllowMediaPlayback}</paper-checkbox>
                         <paper-checkbox id="chkEnableAudioPlaybackTranscoding">${OptionAllowAudioPlaybackTranscoding}</paper-checkbox>
                         <paper-checkbox id="chkEnableVideoPlaybackTranscoding">${OptionAllowVideoPlaybackTranscoding}</paper-checkbox>
+                        <paper-checkbox id="chkEnableVideoPlaybackRemuxing">${OptionAllowVideoPlaybackRemuxing}</paper-checkbox>
                     </div>
                     <div class="fieldDescription">${OptionAllowMediaPlaybackTranscodingHelp}</div>
                     <br />