diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html
index ef00c50bd..1fb94fbac 100644
--- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html
@@ -315,18 +315,26 @@
                                             <p class="form-control-static" ng-bind="partner.client_moniker"></p>
                                         </div>
                                     </div>
-                                    <div class="form-group">
-                                        <label class="control-label col-sm-2">Company Name</label>
-
+                                    <div class="form-group"
+                                         ng-class="{'has-error':partnerForm.company_name.$invalid && partnerForm.company_name.$dirty}">
+                                        <label class="control-label col-sm-2" for="company-name-input">Company Name</label>
                                         <div class="col-sm-8">
-                                            <p class="form-control-static" ng-bind="partner.company_name"></p>
+                                            <input class="form-control" ng-model="partner.company_name" type="text" name="company_name"
+                                                   id="company-name-input" maxlength="100" required>
+                                            <div ng-messages="partnerForm.company_name.$error" ng-if="partnerForm.company_name.$dirty">
+                                                <p class="small text-danger" ng-message="required">No more than 100 characters</p>
+                                            </div>
                                         </div>
                                     </div>
-                                    <div class="form-group">
-                                        <label class="control-label col-sm-2">Short Name</label>
-
+                                    <div class="form-group"
+                                         ng-class="{'has-error':partnerForm.short_name.$invalid && partnerForm.short_name.$dirty}">
+                                        <label class="control-label col-sm-2" for="company-name-input">Short Name</label>
                                         <div class="col-sm-8">
-                                            <p class="form-control-static" ng-bind="partner.short_name"></p>
+                                            <input class="form-control" ng-model="partner.short_name" type="text" name="short_name"
+                                                   id="short-name-input" maxlength="50" required>
+                                            <div ng-messages="partnerForm.short_name.$error" ng-if="partnerForm.short_name.$dirty">
+                                                <p class="small text-danger" ng-message="required">No more than 50 characters</p>
+                                            </div>
                                         </div>
                                     </div>
                                     <div class="form-group"