diff --git a/ogcp/templates/actions/image_create.html b/ogcp/templates/actions/image_create.html
index 0865ea0..c607b97 100644
--- a/ogcp/templates/actions/image_create.html
+++ b/ogcp/templates/actions/image_create.html
@@ -10,9 +10,7 @@
 
 <h2 class="mx-5 subhead-heading">{{_('Create a partition image')}}</h2>
 
-<h2 class="mx-5">
-  {{ _('Selected client') }}: {{ form.ip.data }}
-</h1>
+{{ macros.cmd_selected_clients(selected_clients) }}
 
 {{ wtf.quick_form(form,
                   action=url_for('action_image_create'),
diff --git a/ogcp/views.py b/ogcp/views.py
index 9a0c8e2..5418018 100644
--- a/ogcp/views.py
+++ b/ogcp/views.py
@@ -2574,8 +2574,11 @@ def action_image_create():
         form.repository.render_kw = {'readonly': True}
 
         scopes, clients = get_scopes(set(ips))
+        selected_clients = list(get_selected_clients(scopes['scope']).items())
+
         return render_template('actions/image_create.html', form=form,
-                               scopes=scopes)
+                               scopes=scopes,
+                               selected_clients=selected_clients)
 
 
 @app.route('/action/image/update', methods=['GET', 'POST'])