diff --git a/peppol-smp-server-webapp/src/main/java/com/helger/peppol/smpserver/ui/secure/PageSecureEndpoint.java b/peppol-smp-server-webapp/src/main/java/com/helger/peppol/smpserver/ui/secure/PageSecureEndpoint.java
index d97a256ca..1b0ba8f8a 100644
--- a/peppol-smp-server-webapp/src/main/java/com/helger/peppol/smpserver/ui/secure/PageSecureEndpoint.java
+++ b/peppol-smp-server-webapp/src/main/java/com/helger/peppol/smpserver/ui/secure/PageSecureEndpoint.java
@@ -842,8 +842,8 @@ protected void showInputForm (@Nonnull final WebPageExecutionContext aWPEC,
 
     aForm.addFormGroup (new BootstrapFormGroup ().setLabel ("Extension")
                                                  .setCtrl (new HCTextAreaAutosize (new RequestField (FIELD_EXTENSION,
-                                                                                                     aSelectedObject != null ? aSelectedObject.getFirstExtensionXML ()
-                                                                                                                             : null)))
+                                                                                                     aSelectedEndpoint != null ? aSelectedEndpoint.getFirstExtensionXML ()
+                                                                                                                               : null)))
                                                  .setHelpText ("Optional extension to the endpoint. If present it must be valid XML content!")
                                                  .setErrorList (aFormErrors.getListOfField (FIELD_EXTENSION)));
   }