diff --git a/ogcp/templates/actions/client_details.html b/ogcp/templates/actions/client_details.html
index b7d0615..03c761e 100644
--- a/ogcp/templates/actions/client_details.html
+++ b/ogcp/templates/actions/client_details.html
@@ -11,10 +11,74 @@
 
 <h2 class="mx-5 subhead-heading">{{_('Client details')}}</h2>
 
-{{ wtf.quick_form(form,
-                  method='post',
-                  button_map={'submit': 'primary'},
-                  extra_classes="mx-5") }}
+<div class="container mt-5">
+    <form method="POST">
+        {{ form.hidden_tag() }}
+
+        {{ form.server() }}
+        {{ form.folder_id() }}
+
+        <div class="form-group row">
+            <label for="name" class="col-sm-2 col-form-label">{{ form.name.label }}</label>
+            <div class="col-sm-9">
+                {{ form.name(class="form-control") }}
+            </div>
+        </div>
+
+        <div class="form-group row">
+            <label for="ip" class="col-sm-2 col-form-label">{{ form.ip.label }}</label>
+            <div class="col-sm-9">
+                {{ form.ip(class="form-control") }}
+            </div>
+        </div>
+
+        <div class="form-group row">
+            <label for="mac" class="col-sm-2 col-form-label">{{ form.mac.label }}</label>
+            <div class="col-sm-9">
+                {{ form.mac(class="form-control") }}
+            </div>
+        </div>
+
+        <div class="form-group row">
+            <label for="serial_number" class="col-sm-2 col-form-label">{{ form.serial_number.label }}</label>
+            <div class="col-sm-9">
+                {{ form.serial_number(class="form-control") }}
+            </div>
+        </div>
+
+        <div class="form-group row">
+            <label for="livedir" class="col-sm-2 col-form-label">{{ form.livedir.label }}</label>
+            <div class="col-sm-9">
+                {{ form.livedir(class="form-control") }}
+            </div>
+        </div>
+
+        <div class="form-group row">
+            <label for="repo" class="col-sm-2 col-form-label">{{ form.repo.label }}</label>
+            <div class="col-sm-9">
+                {{ form.repo(class="form-control") }}
+            </div>
+        </div>
+
+        <div class="form-group row">
+            <label for="room" class="col-sm-2 col-form-label">{{ form.room.label }}</label>
+            <div class="col-sm-9">
+                {{ form.room(class="form-control") }}
+            </div>
+        </div>
+
+        <div class="form-group row">
+            <label for="boot" class="col-sm-2 col-form-label">{{ form.boot.label }}</label>
+            <div class="col-sm-9">
+                {{ form.boot(class="form-control") }}
+            </div>
+        </div>
+
+        <div class="form-group">
+            {{ form.submit(class="btn btn-primary") }}
+        </div>
+    </form>
+</div>
 
 <table class="table">
     <tbody class="text-center">