diff --git a/app/assets/javascripts/foreman_wds/host_edit_extensions.js b/app/assets/javascripts/foreman_wds/host_edit_extensions.js
index 0507911e50436f6070f833217999444e4d486194..f6e5a67938a6ea387f7d5a1af040768d7312d64d 100644
--- a/app/assets/javascripts/foreman_wds/host_edit_extensions.js
+++ b/app/assets/javascripts/foreman_wds/host_edit_extensions.js
@@ -27,6 +27,10 @@ os_selected = function(element){
     $('#wds_server_select select').prop('disabled', true);
     $('#wds_image_select select').prop('disabled', true);
   } else {
+    if ($('#wds_server_select select').val() !== '') {
+        wds_server_selected($('#wds_server_select select'));
+    }
+
     $('#wds_server_select select').prop('disabled', false);
   }
 };
diff --git a/app/views/wds_servers/_server_select.html.erb b/app/views/wds_servers/_server_select.html.erb
index 7fac45582bbe5607b8b848146460c1fa3c397e69..ddd55bf1fb5d95f7ad0c847d1743210589f719ac 100644
--- a/app/views/wds_servers/_server_select.html.erb
+++ b/app/views/wds_servers/_server_select.html.erb
@@ -8,5 +8,5 @@
       disabled: f.object.host.operatingsystem.nil? || f.object.host.operatingsystem.family != 'Windows',
       help_inline: :indicator,
       required: true,
-      onchange: 'wds_server_selected(this);', :'data-url' => wds_server_selected_hosts_path, :'data-type' => controller_name.singularize } %>
+      onchange: 'wds_server_selected(this);', :'data-url' => method_path('wds_server_selected'), :'data-type' => controller_name.singularize } %>
 <% end %>