diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js
index c5dc1d25a0..3a059aa776 100644
--- a/dashboard-ui/scripts/encodingsettings.js
+++ b/dashboard-ui/scripts/encodingsettings.js
@@ -7,7 +7,7 @@
         $('#selectVideoDecoder', page).val(config.HardwareAccelerationType);
         $('#selectThreadCount', page).val(config.EncodingThreadCount);
         $('#txtDownMixAudioBoost', page).val(config.DownMixAudioBoost);
-        $('.txtEncoderPath', page).val(config.EncoderAppPath || '');
+        page.querySelector('.txtEncoderPath').value = config.EncoderAppPath || '';
         $('#txtTranscodingTempPath', page).val(config.TranscodingTempPath || '');
 
         Dashboard.hideLoadingMsg();
diff --git a/dashboard-ui/scripts/wizarduserpage.js b/dashboard-ui/scripts/wizarduserpage.js
index 35df931e78..5608fba3af 100644
--- a/dashboard-ui/scripts/wizarduserpage.js
+++ b/dashboard-ui/scripts/wizarduserpage.js
@@ -93,8 +93,8 @@
 
         apiClient.getJSON(apiClient.getUrl('Startup/User')).then(function (user) {
 
-            page.querySelector('#txtUsername').value = user.Name;
-            page.querySelector('#txtConnectUserName').value = user.ConnectUserName;
+            page.querySelector('#txtUsername').value = user.Name || '';
+            page.querySelector('#txtConnectUserName').value = user.ConnectUserName || '';
 
             Dashboard.hideLoadingMsg();
         });