diff --git a/app/controllers/public/index.js b/app/controllers/public/index.js
index 4f7708a04b6..4aab82679c8 100644
--- a/app/controllers/public/index.js
+++ b/app/controllers/public/index.js
@@ -131,7 +131,7 @@ export default Controller.extend({
         order.set('attendees', attendees);
         await order.save()
           .then(order => {
-            this.notify.success(this.l10n.t('Order details saved. Please fill further details within 10 minutes.'));
+            this.notify.success(this.l10n.t(`Order details saved. Please fill further details within ${this.settings.orderExpiryTime} minutes.`));
             this.transitionToRoute('orders.new', order.identifier);
           })
           .catch(async e => {
diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs
index 6fbb20859b0..4ca3e835100 100644
--- a/app/templates/components/forms/orders/order-form.hbs
+++ b/app/templates/components/forms/orders/order-form.hbs
@@ -49,9 +49,7 @@
         </div>
         {{#each allFields.attendee as |field|}}
           {{#if field.isIncluded}}
-            <div class="field {{if
-              (and sameAsBuyer (eq index 0) (or (eq field.fieldIdentifier 'firstname') (eq field.fieldIdentifier 'lastname') (eq field.fieldIdentifier 'email')))
-              'disabled'}}">
+            <div class="field">
               <label class="{{if field.isRequired 'required'}}" for="name">{{field.name}}</label>
               {{#if (is-input-field field.type) }}
                 {{#if field.isLongText}}
@@ -59,9 +57,13 @@
                                                    name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}}
                 
                 {{else}}
-                  {{input type=field.type value=(mut (get holder field.fieldIdentifier))
-                          name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}}
-
+                  {{#if (and sameAsBuyer (eq index 0) (or (eq field.fieldIdentifier 'firstname') (eq field.fieldIdentifier 'lastname') (eq field.fieldIdentifier 'email')))}}
+                    {{input type=field.type value=(mut (get holder field.fieldIdentifier))
+                            name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index)) readonly=""}}
+                  {{else}}
+                    {{input type=field.type value=(mut (get holder field.fieldIdentifier))
+                            name=(if field.isRequired (concat field.fieldIdentifier '_required_' index) (concat field.fieldIdentifier '_' index))}}
+                  {{/if}}
                 {{/if}}
               {{else if (eq field.fieldIdentifier 'gender')}}
                 {{#ui-dropdown class='search selection' value=(mut (get holder field.fieldIdentifier)) onChange=(action (mut holder.gender)) as |execute mapper|}}