diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index cb15598d5b8..cadde8c91a7 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -1228,8 +1228,11 @@
                         }
                       });                                              
                     }                    
-                    $providers.each(function() {
-                      $(this).val($(this).find('option:first'));
+                    $providers.each(function() {  
+                      //if selected option is disabled, select the first enabled option instead
+                      if($(this).find('option:selected:disabled').length > 0) {                        
+                        $(this).val($(this).find('option:first'));
+                      }
                     });