diff --git a/dashboard-ui/apiclient/apiclient.js b/dashboard-ui/apiclient/apiclient.js
index a0e454107a..55901dd43a 100644
--- a/dashboard-ui/apiclient/apiclient.js
+++ b/dashboard-ui/apiclient/apiclient.js
@@ -2617,8 +2617,9 @@
          */
         self.authenticateUserByName = function (name, password) {
 
+            var deferred = DeferredBuilder.Deferred();
+
             if (!name) {
-                var deferred = DeferredBuilder.Deferred();
                 deferred.reject();
                 return deferred.promise();
             }
@@ -2630,7 +2631,7 @@
                 Username: name
             };
 
-            return self.ajax({
+            self.ajax({
                 type: "POST",
                 url: url,
                 data: JSON.stringify(postData),
@@ -2639,8 +2640,18 @@
 
             }).done(function (result) {
 
-                Events.trigger(self, 'authenticated', [result]);
+                if (self.onAuthenticated) {
+                    self.onAuthenticated(self, result);
+                }
+
+                deferred.resolveWith(null, [result]);
+
+            }).fail(function () {
+
+                deferred.reject();
             });
+
+            return deferred.promise();
         };
 
         /**
diff --git a/dashboard-ui/apiclient/connectionmanager.js b/dashboard-ui/apiclient/connectionmanager.js
index a10c4ad1c7..0539ca1fbe 100644
--- a/dashboard-ui/apiclient/connectionmanager.js
+++ b/dashboard-ui/apiclient/connectionmanager.js
@@ -176,9 +176,9 @@
             existingServer.ManualAddress = apiClient.serverAddress();
             apiClient.serverInfo(existingServer);
 
-            Events.on(apiClient, 'authenticated', function (e, result) {
-                onAuthenticated(this, result, {}, true);
-            });
+            apiClient.onAuthenticated = function (instance, result) {
+                onAuthenticated(instance, result, {}, true);
+            };
 
             if (!existingServers.length) {
                 var credentials = credentialProvider.credentials();
@@ -235,9 +235,9 @@
 
                 apiClient.serverInfo(server);
 
-                Events.on(apiClient, 'authenticated', function (e, result) {
-                    onAuthenticated(this, result, {}, true);
-                });
+                apiClient.onAuthenticated = function (instance, result) {
+                    onAuthenticated(instance, result, {}, true);
+                };
 
                 Events.trigger(self, 'apiclientcreated', [apiClient]);
             }
diff --git a/dashboard-ui/apiclient/credentials.js b/dashboard-ui/apiclient/credentials.js
index b913efc6e7..1633b75772 100644
--- a/dashboard-ui/apiclient/credentials.js
+++ b/dashboard-ui/apiclient/credentials.js
@@ -18,9 +18,7 @@
 
                 Logger.log('credentials initialized with: ' + json);
                 credentials = JSON.parse(json);
-                credentials.Servers = credentials.Servers || credentials.servers || [];
-
-                credentials.servers = null;
+                credentials.Servers = credentials.Servers || [];
             }
         }
 
diff --git a/dashboard-ui/scripts/livetvguideprovider-scd.js b/dashboard-ui/scripts/livetvguideprovider-scd.js
index 00b20b5cd6..7528175603 100644
--- a/dashboard-ui/scripts/livetvguideprovider-scd.js
+++ b/dashboard-ui/scripts/livetvguideprovider-scd.js
@@ -56,6 +56,15 @@
 
     function submitListingsForm(page) {
 
+        var selectedListingsId = $('#selectListing', page).val();
+
+        if (!selectedListingsId) {
+            Dashboard.alert({
+                message: Globalize.translate('ErrorPleaseSelectLineup')
+            });
+            return;
+        }
+
         Dashboard.showLoadingMsg();
 
         var id = providerId;
@@ -68,7 +77,7 @@
 
             info.ZipCode = $('#txtZipCode', page).val();
             info.Country = $('#selectCountry', page).val();
-            info.ListingsId = $('#selectListing', page).val();
+            info.ListingsId = selectedListingsId;
 
             ApiClient.ajax({
                 type: "POST",