diff --git a/html/typo3conf/ext/ter_fe2/Resources/Private/Templates/Extension/Edit.html b/html/typo3conf/ext/ter_fe2/Resources/Private/Templates/Extension/Edit.html
index 38da50863a18721d61694c5a354e4c134a395588..8c01ecc6d4675e43409ed04a562f397703ed17e4 100644
--- a/html/typo3conf/ext/ter_fe2/Resources/Private/Templates/Extension/Edit.html
+++ b/html/typo3conf/ext/ter_fe2/Resources/Private/Templates/Extension/Edit.html
@@ -29,7 +29,7 @@
                             <f:translate key="tx_terfe2_domain_model_extension.composer_name" />
                         </label>
                         <div class="col-9">
-                            <f:form.textfield class="form-control" id="composerName" property="composerName" value="{extension.composerName}" additionalAttributes="{placeholder:'{extension.lastVersion.composerName}'}" />
+                            <f:form.textfield class="form-control" data="{composer: '{extension.lastVersion.composerName -> f:or(alternative: extension.composerName)}'}" id="composerName" property="composerName" value="" />
                         </div>
                     </div>
                 </f:if>
diff --git a/html/typo3conf/ext/ter_fe2/Resources/Public/Javascript/Default.js b/html/typo3conf/ext/ter_fe2/Resources/Public/Javascript/Default.js
index edebfc1c9b57a36b4cfe462468689b407790b5b5..b14995e38a34bc507c82835df71d0b91f2fcc877 100644
--- a/html/typo3conf/ext/ter_fe2/Resources/Public/Javascript/Default.js
+++ b/html/typo3conf/ext/ter_fe2/Resources/Public/Javascript/Default.js
@@ -40,10 +40,17 @@ jQuery(document).ready(function ($) {
 
     var $packagistField = $("input[name='tx_terfe2_pi1[packagistConfirm]']");
     var $composerNameInput = $(".js-composer-name-input");
+    var _composerNameField = $( "#composerName" );
 
     $composerNameInput.toggle($packagistField.is( ":checked" ));
+    if (_composerNameField.val() === "") {
+        _composerNameField.val(_composerNameField.data( "composer" ))
+    }
     $packagistField.click(function() {
         $composerNameInput.toggle(this.checked);
+        if (_composerNameField.val() === "") {
+            _composerNameField.val(_composerNameField.data("composer"))
+        }
     });