diff --git a/pwa/src/templates/templateParts/applicationsForm/ApplicationsFormTemplate.tsx b/pwa/src/templates/templateParts/applicationsForm/ApplicationsFormTemplate.tsx
index 2baca593..718d4a65 100644
--- a/pwa/src/templates/templateParts/applicationsForm/ApplicationsFormTemplate.tsx
+++ b/pwa/src/templates/templateParts/applicationsForm/ApplicationsFormTemplate.tsx
@@ -55,9 +55,11 @@ export const ApplicationsFormTemplate: React.FC<ApplicationFormTemplateProps> =
       "reference",
       "name",
       "description",
+      "version",
       "public",
       "secret",
       "publicKey",
+      "privateKey",
       "resource",
       "organization",
       "ednpoints",
@@ -91,7 +93,7 @@ export const ApplicationsFormTemplate: React.FC<ApplicationFormTemplateProps> =
               <InputText
                 {...{ register, errors }}
                 name="reference"
-                validation={enrichValidation({ required: true})}
+                validation={enrichValidation({ required: true })}
                 disabled={isLoading.applicationForm}
                 ariaLabel={t("Enter reference")}
               />
@@ -122,6 +124,18 @@ export const ApplicationsFormTemplate: React.FC<ApplicationFormTemplateProps> =
               />
             </FormFieldInput>
           </FormField>
+          <FormField>
+            <FormFieldInput>
+              <FormFieldLabel>{t("Version")}</FormFieldLabel>
+              <InputText
+                {...{ register, errors }}
+                name="version"
+                disabled={isLoading.applicationForm}
+                defaultValue={application?.version ?? "0.0.0"}
+                ariaLabel={t("Enter version")}
+              />
+            </FormFieldInput>
+          </FormField>
           <FormField>
             <FormFieldInput>
               <FormFieldLabel>{t("Domains")}</FormFieldLabel>
@@ -166,7 +180,7 @@ export const ApplicationsFormTemplate: React.FC<ApplicationFormTemplateProps> =
 
           <FormField>
             <FormFieldInput>
-              <FormFieldLabel>{t("publicKey")}</FormFieldLabel>
+              <FormFieldLabel>{t("publicKey (write only)")}</FormFieldLabel>
               <Textarea
                 {...{ register, errors }}
                 name="publicKey"
@@ -176,6 +190,18 @@ export const ApplicationsFormTemplate: React.FC<ApplicationFormTemplateProps> =
             </FormFieldInput>
           </FormField>
 
+          <FormField>
+            <FormFieldInput>
+              <FormFieldLabel>{t("privateKey (write only)")}</FormFieldLabel>
+              <Textarea
+                {...{ register, errors }}
+                name="privateKey"
+                disabled={isLoading.applicationForm}
+                ariaLabel={t("Enter privateKey")}
+              />
+            </FormFieldInput>
+          </FormField>
+
           <FormField>
             <FormFieldInput>
               <FormFieldLabel>{t("Resource")}</FormFieldLabel>
diff --git a/pwa/src/templates/templateParts/userForm/UserFormTemplate.tsx b/pwa/src/templates/templateParts/userForm/UserFormTemplate.tsx
index 1d34a21f..2be4afe2 100644
--- a/pwa/src/templates/templateParts/userForm/UserFormTemplate.tsx
+++ b/pwa/src/templates/templateParts/userForm/UserFormTemplate.tsx
@@ -68,7 +68,7 @@ export const UserFormTemplate: React.FC<UserFormTemplateProps> = ({ user }) => {
   }, [password, validationPassword]);
 
   const handleSetFormValues = (user: any): void => {
-    const basicFields: string[] = ["name", "description", "email", "password", "locale", "person"];
+    const basicFields: string[] = ["reference", "name", "description", "version", "email", "password", "locale", "person"];
     basicFields.forEach((field) => setValue(field, user[field]));
 
     setValue(
@@ -117,6 +117,31 @@ export const UserFormTemplate: React.FC<UserFormTemplateProps> = ({ user }) => {
     <form onSubmit={handleSubmit(onSubmit)} id={formId} className={styles.formContainer}>
       <div className={styles.gridContainer}>
         <div className={styles.grid}>
+          <FormField>
+            <FormFieldInput>
+              <FormFieldLabel>{t("Reference")}</FormFieldLabel>
+              <InputText
+                {...{ register, errors }}
+                name="reference"
+                disabled={isLoading.userForm}
+                ariaLabel={t("Enter reference")}
+              />
+            </FormFieldInput>
+          </FormField>
+
+          <FormField>
+            <FormFieldInput>
+              <FormFieldLabel>{t("Version")}</FormFieldLabel>
+              <InputText
+                {...{ register, errors }}
+                name="version"
+                disabled={isLoading.userForm}
+                defaultValue={user?.version ?? "0.0.0"}
+                ariaLabel={t("Enter version")}
+              />
+            </FormFieldInput>
+          </FormField>
+
           <FormField>
             <FormFieldInput>
               <FormFieldLabel>{t("Name")}</FormFieldLabel>