diff --git a/web/frontend/peerings-edit.html b/web/frontend/peerings-edit.html
index ca72271..bae7ea4 100644
--- a/web/frontend/peerings-edit.html
+++ b/web/frontend/peerings-edit.html
@@ -174,9 +174,9 @@
 
 <div>
     {% for peering in mnt_peerings %}
-    <a href="?node={{peering['node']}}&asn={{session['user-data']['asn']}}">
+    <a href="?node={{peering['node']}}&asn={% if session['login'] != config['MNT'] %}{{session['user-data']['asn']}}{%else%}{{peering['asn']}}{%endif%}">
         <button {% if selected_peering %}{% if selected_peering == peering['node'] %}class="button-selected"{% endif %}{% endif %}>
-            with<br>{{peering["node"]}}
+            {% if session['login'] == config['MNT'] %}{{peering['asn']}}<br>{%endif%}with<br>{{peering["node"]}}
         </button>
         {% if selected_node == peering['node'] %}
             {% set selected_peering = peering %}
@@ -190,7 +190,7 @@
         <tr>
             <td><label for="peer-asn">Your ASN</label></td>
             <td></td>
-            <td><input type="text" name="peer-asn" id="peer-asn" {% if session["login"] != config["MNT"] %}disabled="disabled"{%endif%} value="{{session['user-data']['asn']}}"></td>
+            <td><input type="text" name="peer-asn" id="peer-asn" {% if session["login"] != config["MNT"] %}disabled="disabled"{%endif%} value="{% if session['login'] != config['MNT'] %}{{session['user-data']['asn']}}{%else%}{{selected_peering['asn']}}{%endif%}"></td>
         </tr>
         <tr>
             <td><h4>Wireguard</h4></td>