diff --git a/ui/src/app/user/user-detail.component.html b/ui/src/app/user/user-detail.component.html
index e8c06f390..1b64b20de 100644
--- a/ui/src/app/user/user-detail.component.html
+++ b/ui/src/app/user/user-detail.component.html
@@ -18,7 +18,7 @@ <h1 class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser.detail.title.string">Use
           <dd class="col-md-10">
             {{ user.lastName }}
           </dd>
-          <dt class="col-md-2" i18n="@@gatewayApp.msUserServiceMSUser.mainContact.string">Main Contact</dt>
+          <dt class="col-md-2" i18n="@@gatewayApp.msUserServiceMSUser.mainContact.string">Organization owner</dt>
           <dd class="col-md-10">
             <span class="sr-only" *ngIf="user.mainContact" i18n="@@global.true.string">True</span>
             <span class="sr-only" *ngIf="!user.mainContact" i18n="@@global.false.string">False</span>
@@ -35,7 +35,7 @@ <h1 class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser.detail.title.string">Use
               [styles]="{ color: '#f22112' }"
             ></fa-icon>
           </dd>
-          <dt class="col-md-2" i18n="@@gatewayApp.msUserServiceMSUser.salesforceId.string">Salesforce Id</dt>
+          <dt class="col-md-2" i18n="@@gatewayApp.msUserServiceMSUser.salesforceId.string">Organization</dt>
           <dd class="col-md-10">
             {{ user.memberName }}
           </dd>
@@ -75,12 +75,12 @@ <h1 class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser.detail.title.string">Use
               ></fa-icon>
             </dd>
           </ng-container>
-          <dt class="col-md-2" i18n="@@gatewayApp.msUserServiceMSUser.createdDate.string">Created Date</dt>
+          <dt class="col-md-2" i18n="@@gatewayApp.msUserServiceMSUser.createdDate.string">Created</dt>
           <dd class="col-md-10">
             {{ user.createdDate!.toString() | date: 'medium' }}
             <i><span i18n="@@global.by.string">by</span> {{ user.createdBy }}</i>
           </dd>
-          <dt class="col-md-2" i18n="@@gatewayApp.msUserServiceMSUser.lastModifiedDate.string">Last Modified Date</dt>
+          <dt class="col-md-2" i18n="@@gatewayApp.msUserServiceMSUser.lastModifiedDate.string">Last Modified</dt>
           <dd class="col-md-10">
             <span
               >{{ user.lastModifiedDate!.toString() | date: 'medium' }}
diff --git a/ui/src/app/user/user-update.component.html b/ui/src/app/user/user-update.component.html
index 09074d339..f6865ca92 100644
--- a/ui/src/app/user/user-update.component.html
+++ b/ui/src/app/user/user-update.component.html
@@ -65,7 +65,7 @@ <h1 id="jhi-ms-user-heading" class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser
             class="form-control-label"
             i18n="@@gatewayApp.msUserServiceMSUser.mainContact.string"
             for="field_mainContact"
-            >Main Contact</label
+            >Organization Owner</label
           >
         </div>
         <div class="form-group">
@@ -73,7 +73,7 @@ <h1 id="jhi-ms-user-heading" class="mt-5" i18n="@@gatewayApp.msUserServiceMSUser
             class="form-control-label"
             i18n="@@gatewayApp.msUserServiceMSUser.salesforceId.string"
             for="field_salesforceId.string"
-            >Salesforce Id</label
+            >Organization</label
           >
           <fieldset [disabled]="disableSalesForceIdDD()">
             <select