diff --git a/static/js/base.js b/static/js/base.js
index 55182472..02746302 100644
--- a/static/js/base.js
+++ b/static/js/base.js
@@ -126,7 +126,7 @@ function displayNote(note, alias, user_note_field = null, profile_pic_field = nu
     if (user_note_field !== null) {
         $("#" + user_note_field).removeAttr('class');
         $("#" + user_note_field).addClass(displayStyle(note));
-        $("#" + user_note_field).text(alias + (note.balance == null ? "" : (":\n" + pretty_money(note.balance))));
+        $("#" + user_note_field).text(alias + (note.balance == null ? "" : (" :\n" + pretty_money(note.balance))));
         if (profile_pic_field != null) {
             $("#" + profile_pic_field).attr('src', img);
             $("#" + profile_pic_field).click(function () {
@@ -311,7 +311,7 @@ function autoCompleteNote(field_id, note_list_id, notes, notes_display, alias_pr
                                 disp.name
                                 + "<span class=\"badge badge-dark badge-pill\">"
                                 + disp.quantity + "</span>",
-                                displayStyle(disp.note.balance));
+                                displayStyle(disp.note));
                         });
 
                         // Emitters are displayed
diff --git a/static/js/transfer.js b/static/js/transfer.js
index 9972b64e..69fafac5 100644
--- a/static/js/transfer.js
+++ b/static/js/transfer.js
@@ -26,36 +26,44 @@ function reset() {
 }
 
 $(document).ready(function() {
-    autoCompleteNote("source_note", "source_note_list", sources, sources_notes_display,
-        "source_alias", "source_note", "user_note", "profile_pic");
-    autoCompleteNote("dest_note", "dest_note_list", dests, dests_notes_display,
-        "dest_alias", "dest_note", "user_note", "profile_pic", function() {
-            if ($("#type_credit").is(":checked") || $("#type_debit").is(":checked")) {
-                let last = dests_notes_display[dests_notes_display.length - 1];
-                dests_notes_display.length = 0;
-                dests_notes_display.push(last);
+    /**
+     * If we are in credit/debit mode, check that only one note is entered.
+     * More over, get first name and last name to autocomplete fields.
+     */
+    function checkUniqueNote() {
+        if ($("#type_credit").is(":checked") || $("#type_debit").is(":checked")) {
+            let arr = $("#type_credit").is(":checked") ? dests_notes_display : sources_notes_display;
 
-                last.quantity = 1;
+            let last = arr[arr.length - 1];
+            arr.length = 0;
+            arr.push(last);
 
-                if (!last.note.user) {
-                    $.getJSON("/api/note/note/" + last.note.id + "/?format=json", function(note) {
-                        last.note.user = note.user;
-                        $.getJSON("/api/user/" + last.note.user + "/", function(user) {
-                            $("#last_name").val(user.last_name);
-                            $("#first_name").val(user.first_name);
-                        });
-                    });
-                }
-                else {
+            last.quantity = 1;
+
+            if (!last.note.user) {
+                $.getJSON("/api/note/note/" + last.note.id + "/?format=json", function(note) {
+                    last.note.user = note.user;
                     $.getJSON("/api/user/" + last.note.user + "/", function(user) {
                         $("#last_name").val(user.last_name);
                         $("#first_name").val(user.first_name);
                     });
-                }
+                });
             }
+            else {
+                $.getJSON("/api/user/" + last.note.user + "/", function(user) {
+                    $("#last_name").val(user.last_name);
+                    $("#first_name").val(user.first_name);
+                });
+            }
+        }
 
-            return true;
-       });
+        return true;
+   }
+
+    autoCompleteNote("source_note", "source_note_list", sources, sources_notes_display,
+        "source_alias", "source_note", "user_note", "profile_pic", checkUniqueNote);
+    autoCompleteNote("dest_note", "dest_note_list", dests, dests_notes_display,
+        "dest_alias", "dest_note", "user_note", "profile_pic", checkUniqueNote);
 
 
     // Ensure we begin in gift mode. Removing these lines may cause problems when reloading.
@@ -182,10 +190,11 @@ $("#btn_transfer").click(function() {
         });
     } else if ($("#type_credit").is(':checked') || $("#type_debit").is(':checked')) {
         let special_note = $("#credit_type").val();
-        let user_note = dests_notes_display[0].note.id;
+        let user_note;
         let given_reason = $("#reason").val();
         let source, dest, reason;
         if ($("#type_credit").is(':checked')) {
+            user_note = dests_notes_display[0].note.id;
             source = special_note;
             dest = user_note;
             reason = "Crédit " + $("#credit_type option:selected").text().toLowerCase();
@@ -193,6 +202,7 @@ $("#btn_transfer").click(function() {
                 reason += " (" + given_reason + ")";
         }
         else {
+            user_note = sources_notes_display[0].note.id;
             source = user_note;
             dest = special_note;
             reason = "Retrait " + $("#credit_type option:selected").text().toLowerCase();
diff --git a/templates/note/conso_form.html b/templates/note/conso_form.html
index b3efea36..35eff32c 100644
--- a/templates/note/conso_form.html
+++ b/templates/note/conso_form.html
@@ -36,7 +36,7 @@
                         {# User search with autocompletion #}
                         <div class="card-body p-0">
                             <input class="form-control mx-auto d-block"
-                                placeholder="{% trans "Name or alias" %}" type="text" id="note" autofocus />
+                                placeholder="{% trans "Name or alias..." %}" type="text" id="note" autofocus />
                         </div>
                     </div>
                 </div>
diff --git a/templates/note/transaction_form.html b/templates/note/transaction_form.html
index 70426583..d1cafa1f 100644
--- a/templates/note/transaction_form.html
+++ b/templates/note/transaction_form.html
@@ -38,8 +38,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     </div>
 
     <div class="row">
-       
-        <div class="col-xl-4" id="note_infos_div">
+        <div class="col-md-3" id="note_infos_div">
             <div class="card border-success shadow mb-4">
                 <img src="/media/pic/default.png"
                     id="profile_pic" alt="" class="img-fluid rounded mx-auto d-block">
@@ -48,7 +47,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
                 </div>
             </div>
         </div>
-        <div class="col-md-4" id="emitters_div" style="display: none;">
+
+        <div class="col-md-3" id="emitters_div">
             <div class="card border-success shadow mb-4">
                 <div class="card-header">
                     <p class="card-text font-weight-bold">
@@ -58,22 +58,53 @@ SPDX-License-Identifier: GPL-2.0-or-later
                 <ul class="list-group list-group-flush" id="source_note_list">
                 </ul>
                 <div class="card-body">
-                    <input class="form-control mx-auto d-block" type="text" id="source_note" />
+                    <input class="form-control mx-auto d-block" type="text" id="source_note" placeholder="{% trans "Name or alias..." %}" />
                 </div>
             </div>
         </div>
 
-        {% if "note.notespecial"|not_empty_model_list %}
-            <div class="col-md-4" id="external_div" style="display: none;">
-                <div class="card border-success shadow mb-4">
-                    <div class="card-header">
-                        <p class="card-text font-weight-bold">
-                            {% trans "External payment" %}
-                        </p>
-                    </div>
-                    <ul class="list-group list-group-flush" id="source_note_list">
+        <div class="col-md-3" id="dests_div">
+            <div class="card border-info shadow mb-4">
+                <div class="card-header">
+                    <p class="card-text font-weight-bold" id="dest_title">
+                        {% trans "Select receivers" %}
+                    </p>
+                </div>
+                <ul class="list-group list-group-flush" id="dest_note_list">
+                </ul>
+                <div class="card-body">
+                    <input class="form-control mx-auto d-block" type="text" id="dest_note" placeholder="{% trans "Name or alias..." %}" />
+                    <ul class="list-group list-group-flush" id="dest_alias_matched">
                     </ul>
-                    <div class="card-body">
+                </div>
+            </div>
+        </div>
+
+        <div class="col-md-3" id="external_div">
+            <div class="card border-warning shadow mb-4">
+                <div class="card-header">
+                    <p class="card-text font-weight-bold">
+                        {% trans "Action" %}
+                    </p>
+                </div>
+                <ul class="list-group list-group-flush" id="source_note_list">
+                </ul>
+                <div class="card-body">
+                    <div class="form-row">
+                        <div class="col-md-12">
+                            <label for="amount">{% trans "Amount" %} :</label>
+                            {% include "note/amount_input.html" with widget=amount_widget %}
+                        </div>
+                    </div>
+
+                    <div class="form-row">
+                        <div class="col-md-12">
+                            <label for="reason">{% trans "Reason" %} :</label>
+                            <input class="form-control mx-auto d-block" type="text" id="reason" required />
+                        </div>
+                    </div>
+
+                    <div class="d-none" id="special_transaction_div">
                         <div class="form-row">
                             <div class="col-md-12">
                                 <label for="credit_type">{% trans "Transfer type" %} :</label>
@@ -103,42 +134,14 @@ SPDX-License-Identifier: GPL-2.0-or-later
                             </div>
                         </div>
                     </div>
+                    <hr>
+                    <div class="form-row">
+                        <div class="col-md-12">
+                            <button id="btn_transfer" class="form-control btn btn-primary">{% trans 'Transfer' %}</button>
+                        </div>
+                    </div>
                 </div>
             </div>
-        {% endif %}
-
-        <div class="col-md-8" id="dests_div">
-            <div class="card border-info shadow mb-4">
-                <div class="card-header">
-                    <p class="card-text font-weight-bold" id="dest_title">
-                        {% trans "Select receivers" %}
-                    </p>
-                </div>
-                <ul class="list-group list-group-flush" id="dest_note_list">
-                </ul>
-                <div class="card-body">
-                    <input class="form-control mx-auto d-block" type="text" id="dest_note" />
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-    <div class="form-row">
-        <div class="form-group col-md-6">
-            <label for="amount">{% trans "Amount" %} :</label>
-            {% include "note/amount_input.html" with widget=amount_widget %}
-        </div>
-
-        <div class="form-group col-md-6">
-            <label for="reason">{% trans "Reason" %} :</label>
-            <input class="form-control mx-auto d-block" type="text" id="reason" required />
-        </div>
-    </div>
-
-    <div class="form-row">
-        <div class="col-md-12">
-            <button id="btn_transfer" class="form-control btn btn-primary">{% trans 'Transfer' %}</button>
         </div>
     </div>
 
@@ -158,32 +161,55 @@ SPDX-License-Identifier: GPL-2.0-or-later
         SPECIAL_TRANSFER_POLYMORPHIC_CTYPE = {{ special_polymorphic_ctype }};
         user_id = {{ user.note.pk }};
 
+        source = $("#source_note");
+        dest = $("#dest_note");
+
         $("#type_gift").click(function() {
-            $("#emitters_div").hide();
-            $("#external_div").hide();
-            $("#dests_div").attr('class', 'col-md-8');
-            $("#dest_title").text("{% trans "Select receivers" %}");
+            $("#special_transaction_div").addClass('d-none');
+            source.attr('disabled', true);
+            source.val("{{ user.username }}");
+            source.tooltip('hide');
+            $("#source_note_list").addClass('d-none');
+            dest.attr('disabled', false);
+            $("#dest_note_list").removeClass('d-none');
         });
 
         $("#type_transfer").click(function() {
-            $("#external_div").hide();
-            $("#emitters_div").show();
-            $("#dests_div").attr('class', 'col-md-4');
-            $("#dest_title").text("{% trans "Select receivers" %}");
+            $("#special_transaction_div").addClass('d-none');
+            source.attr('disabled', false);
+            $("#source_note_list").removeClass('d-none');
+            dest.attr('disabled', false);
+            $("#dest_note_list").removeClass('d-none');
         });
 
         $("#type_credit").click(function() {
-            $("#emitters_div").hide();
-            $("#external_div").show();
-            $("#dests_div").attr('class', 'col-md-4');
-            $("#dest_title").text("{% trans "Credit note" %}");
+            $("#special_transaction_div").removeClass('d-none');
+            $("#source_note_list").addClass('d-none');
+            $("#dest_note_list").removeClass('d-none');
+            source.attr('disabled', true);
+            source.val($("#credit_type option:selected").text());
+            source.tooltip('hide');
+            dest.attr('disabled', false);
+            dest.val('');
         });
 
         $("#type_debit").click(function() {
-            $("#emitters_div").hide();
-            $("#external_div").show();
-            $("#dests_div").attr('class', 'col-md-4');
-            $("#dest_title").text("{% trans "Debit note" %}");
+            $("#special_transaction_div").removeClass('d-none');
+            $("#source_note_list").removeClass('d-none');
+            $("#dest_note_list").addClass('d-none');
+            source.attr('disabled', false);
+            source.val('');
+            dest.attr('disabled', true);
+            dest.val($("#credit_type option:selected").text());
+            dest.tooltip('hide');
+        });
+
+        $("#credit_type").change(function() {
+            let type = $("#credit_type option:selected").text();
+            if ($("#type_credit").is(":checked"))
+                source.val(type);
+            else
+                dest.val(type);
         });
     </script>
     <script src="/static/js/transfer.js"></script>