diff --git a/src/glicid_spawner/templates/views/slurm.jinja b/src/glicid_spawner/templates/views/slurm.jinja
index f00fb2e..5486b16 100644
--- a/src/glicid_spawner/templates/views/slurm.jinja
+++ b/src/glicid_spawner/templates/views/slurm.jinja
@@ -17,7 +17,8 @@
                     <div class="col-sm-9 flex-container">
                         {%- for cluster in sinfo.values() -%}
                         <div class="flex-item-2 slurm-cluster" data-cluster="{{cluster}}">
-                            <input type="radio" name="cluster" id="cluster_{{cluster}}" value="{{cluster}}">
+                            <input type="radio" name="cluster" id="cluster_{{cluster}}" value="{{cluster}}"
+                            {% if loop.first %}checked{% endif %}>
                             <label for="cluster_{{cluster}}" class="btn btn-default btn-block">
                                 {{ cluster | capitalize }}
                             </label>
@@ -27,7 +28,7 @@
                 </div>
                 {% endif %}
 
-                <div class="form-group partitions{% if 'N/A' not in sinfo %} hidden{% endif %}">
+                <div class="form-group partitions">
                     <label for="partition" class="col-sm-3 control-label">Partition:</label>
                     <div class="col-sm-9 flex-container">
                         {%- for cluster in sinfo.values() -%}
@@ -125,9 +126,6 @@ not_enough_resources = function (err) {
 toggle_config = function() {
     var config = get_config();
 
-    if (config['cluster'] !== undefined) {
-        $('.partitions').removeClass('hidden');
-    }
     if (config['partition'] !== undefined) {
         $('.nodes').removeClass('hidden');
     }
@@ -140,6 +138,9 @@ toggle_config = function() {
         _toggle(el, config['cpu'], config['mem'], config['gpu'], config['cluster'], config['partition']);
     })
 
+    // Reload config
+    config = get_config();
+
     if ($partitions.not('.hidden').length == 0) {
         $('.partitions').addClass('hidden');
     } else {
diff --git a/tests/test_form.py b/tests/test_form.py
index a43417b..2a706a1 100644
--- a/tests/test_form.py
+++ b/tests/test_form.py
@@ -153,13 +153,18 @@ def test_options_form_slurm(mock_cluster):
     assert '<div class="flex-item-2 slurm-cluster" data-cluster="nautilus">' in html
     assert '<div class="flex-item-2 slurm-cluster" data-cluster="waves">' in html
 
-    assert '<input type="radio" name="cluster" id="cluster_nautilus" value="nautilus">' in html
+    # The 1st cluster is always selected when present…
+    assert (
+        '<input type="radio" name="cluster" id="cluster_nautilus" value="nautilus" checked>' in html
+    )
     assert (
         '<label for="cluster_nautilus" class="btn btn-default btn-block"> Nautilus </label>' in html
     )
 
-    # Partitions (hidden by default for multi-cluster)
-    assert '<div class="form-group partitions hidden">' in html
+    # … not the second one
+    assert '<input type="radio" name="cluster" id="cluster_waves" value="waves" >' in html
+
+    # Partitions
     assert '<label for="partition" class="col-sm-3 control-label">Partition:</label>' in html
 
     assert (