diff --git a/project/docs/views/ajax.py b/project/docs/views/ajax.py
index ceecbab..9892192 100644
--- a/project/docs/views/ajax.py
+++ b/project/docs/views/ajax.py
@@ -55,7 +55,7 @@ def get_client_by_invoice(request, invoice_id):
 
     invoice = Invoice.objects.get(pk=invoice_id)
 
-    return HttpResponse(json.dumps([invoice.client.id,]), mimetype='application/json')
+    return HttpResponse(json.dumps([invoice.client.id, invoice.client.name]), mimetype='application/json')
 
 
 def toggle_doc_status(request, doc_type, doc_id, doc_attr):
diff --git a/project/templates/docs/stub_js.html b/project/templates/docs/stub_js.html
index f2c0bb0..8b71381 100644
--- a/project/templates/docs/stub_js.html
+++ b/project/templates/docs/stub_js.html
@@ -60,8 +60,15 @@
             });
             $.get('/my/docs/ajax_get_client_by_invoice/' + invoice_id, function(data) {
                 var client = data[0];
-                $('#id_client').val(client);
+                console.log(data);
+                //$('#id_client').val(client);
+                $('#id_client_text').hide();
+                $('#id_client-deck').html('<span class="div hilight" data-value='+ data[0] +'><span class="remove div" style="display: inline;">X</span>' + data[1] + '</span>');
+
+                $('#id_client').html('<option selected="selected" value="'+ data[0] +'"></option>');
+                $('#id_client').trigger('change');
             })
+
             $.get('/my/docs/ajax_get_tbl_items/' + invoice_id, function(data) {
                 var items = JSON.parse(data);
                     $.each(items, function(index, item){