diff --git a/src/app/services/cipherService.js b/src/app/services/cipherService.js
index 7e221340..d99b4c6a 100644
--- a/src/app/services/cipherService.js
+++ b/src/app/services/cipherService.js
@@ -138,6 +138,8 @@ angular
                         dataObj.phone = _service.decryptProperty(cipherData.Phone, key, true, false);
                         dataObj.ssn = _service.decryptProperty(cipherData.SSN, key, true, false);
                         dataObj.username = _service.decryptProperty(cipherData.Username, key, true, false);
+                        dataObj.passportNumber = _service.decryptProperty(cipherData.PassportNumber, key, true, false);
+                        dataObj.licenseNumber = _service.decryptProperty(cipherData.LicenseNumber, key, true, false);
                         cipher.identity = dataObj;
                         cipher.icon = 'fa-id-card-o';
                         break;
@@ -513,7 +515,9 @@ angular
                         email: encryptProperty(identityData.email, key),
                         phone: encryptProperty(identityData.phone, key),
                         ssn: encryptProperty(identityData.ssn, key),
-                        username: encryptProperty(identityData.username, key)
+                        username: encryptProperty(identityData.username, key),
+                        passportNumber: encryptProperty(identityData.passportNumber, key),
+                        licenseNumber: encryptProperty(identityData.licenseNumber, key)
                     };
                     break;
                 default:
diff --git a/src/app/vault/views/vaultAddCipher.html b/src/app/vault/views/vaultAddCipher.html
index 5bcb2e16..2b298b76 100644
--- a/src/app/vault/views/vaultAddCipher.html
+++ b/src/app/vault/views/vaultAddCipher.html
@@ -275,21 +275,6 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-4">
-                    <div class="form-group" show-errors>
-                        <label for="identityCompany">Company</label>
-                        <div class="input-group">
-                            <input type="text" id="identityCompany" name="Identity.Company"
-                                   ng-model="cipher.identity.company" class="form-control" ng-readonly="readOnly" api-field />
-                            <span class="input-group-btn" uib-tooltip="Copy Company" tooltip-placement="left">
-                                <button class="btn btn-default btn-flat" type="button" ngclipboard
-                                        ngclipboard-error="clipboardError(e)" data-clipboard-target="#identityCompany">
-                                    <i class="fa fa-clipboard"></i>
-                                </button>
-                            </span>
-                        </div>
-                    </div>
-                </div>
                 <div class="col-sm-4">
                     <div class="form-group" show-errors>
                         <label for="identityUsername">Username</label>
@@ -305,6 +290,23 @@
                         </div>
                     </div>
                 </div>
+                <div class="col-sm-4">
+                    <div class="form-group" show-errors>
+                        <label for="identityCompany">Company</label>
+                        <div class="input-group">
+                            <input type="text" id="identityCompany" name="Identity.Company"
+                                   ng-model="cipher.identity.company" class="form-control" ng-readonly="readOnly" api-field />
+                            <span class="input-group-btn" uib-tooltip="Copy Company" tooltip-placement="left">
+                                <button class="btn btn-default btn-flat" type="button" ngclipboard
+                                        ngclipboard-error="clipboardError(e)" data-clipboard-target="#identityCompany">
+                                    <i class="fa fa-clipboard"></i>
+                                </button>
+                            </span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
                 <div class="col-sm-4">
                     <div class="form-group" show-errors>
                         <label for="identitySSN">Social Security Number</label>
@@ -320,6 +322,38 @@
                         </div>
                     </div>
                 </div>
+                <div class="col-sm-4">
+                    <div class="form-group" show-errors>
+                        <label for="identityPassportNumber">Passport Number</label>
+                        <div class="input-group">
+                            <input type="text" id="identityPassportNumber" name="Identity.PassportNumber"
+                                   ng-model="cipher.identity.passportNumber" class="form-control" ng-readonly="readOnly"
+                                   api-field />
+                            <span class="input-group-btn" uib-tooltip="Copy Passport Number" tooltip-placement="left">
+                                <button class="btn btn-default btn-flat" type="button" ngclipboard
+                                        ngclipboard-error="clipboardError(e)" data-clipboard-target="#identityPassportNumber">
+                                    <i class="fa fa-clipboard"></i>
+                                </button>
+                            </span>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-4">
+                    <div class="form-group" show-errors>
+                        <label for="identityLicenseNumber">License Number</label>
+                        <div class="input-group">
+                            <input type="text" id="identityLicenseNumber" name="Identity.LicenseNumber"
+                                   ng-model="cipher.identity.licenseNumber" class="form-control" ng-readonly="readOnly"
+                                   api-field />
+                            <span class="input-group-btn" uib-tooltip="Copy License Number" tooltip-placement="left">
+                                <button class="btn btn-default btn-flat" type="button" ngclipboard
+                                        ngclipboard-error="clipboardError(e)" data-clipboard-target="#identityLicenseNumber">
+                                    <i class="fa fa-clipboard"></i>
+                                </button>
+                            </span>
+                        </div>
+                    </div>
+                </div>
             </div>
             <div class="row">
                 <div class="col-sm-6">
diff --git a/src/app/vault/views/vaultEditCipher.html b/src/app/vault/views/vaultEditCipher.html
index 5f70fc1a..029dcded 100644
--- a/src/app/vault/views/vaultEditCipher.html
+++ b/src/app/vault/views/vaultEditCipher.html
@@ -267,21 +267,6 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-sm-4">
-                    <div class="form-group" show-errors>
-                        <label for="identityCompany">Company</label>
-                        <div class="input-group">
-                            <input type="text" id="identityCompany" name="Identity.Company"
-                                   ng-model="cipher.identity.company" class="form-control" ng-readonly="readOnly" api-field />
-                            <span class="input-group-btn" uib-tooltip="Copy Company" tooltip-placement="left">
-                                <button class="btn btn-default btn-flat" type="button" ngclipboard
-                                        ngclipboard-error="clipboardError(e)" data-clipboard-target="#identityCompany">
-                                    <i class="fa fa-clipboard"></i>
-                                </button>
-                            </span>
-                        </div>
-                    </div>
-                </div>
                 <div class="col-sm-4">
                     <div class="form-group" show-errors>
                         <label for="identityUsername">Username</label>
@@ -297,6 +282,23 @@
                         </div>
                     </div>
                 </div>
+                <div class="col-sm-4">
+                    <div class="form-group" show-errors>
+                        <label for="identityCompany">Company</label>
+                        <div class="input-group">
+                            <input type="text" id="identityCompany" name="Identity.Company"
+                                   ng-model="cipher.identity.company" class="form-control" ng-readonly="readOnly" api-field />
+                            <span class="input-group-btn" uib-tooltip="Copy Company" tooltip-placement="left">
+                                <button class="btn btn-default btn-flat" type="button" ngclipboard
+                                        ngclipboard-error="clipboardError(e)" data-clipboard-target="#identityCompany">
+                                    <i class="fa fa-clipboard"></i>
+                                </button>
+                            </span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
                 <div class="col-sm-4">
                     <div class="form-group" show-errors>
                         <label for="identitySSN">Social Security Number</label>
@@ -312,6 +314,38 @@
                         </div>
                     </div>
                 </div>
+                <div class="col-sm-4">
+                    <div class="form-group" show-errors>
+                        <label for="identityPassportNumber">Passport Number</label>
+                        <div class="input-group">
+                            <input type="text" id="identityPassportNumber" name="Identity.PassportNumber"
+                                   ng-model="cipher.identity.passportNumber" class="form-control" ng-readonly="readOnly"
+                                   api-field />
+                            <span class="input-group-btn" uib-tooltip="Copy Passport Number" tooltip-placement="left">
+                                <button class="btn btn-default btn-flat" type="button" ngclipboard
+                                        ngclipboard-error="clipboardError(e)" data-clipboard-target="#identityPassportNumber">
+                                    <i class="fa fa-clipboard"></i>
+                                </button>
+                            </span>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-4">
+                    <div class="form-group" show-errors>
+                        <label for="identityLicenseNumber">License Number</label>
+                        <div class="input-group">
+                            <input type="text" id="identityLicenseNumber" name="Identity.LicenseNumber"
+                                   ng-model="cipher.identity.licenseNumber" class="form-control" ng-readonly="readOnly"
+                                   api-field />
+                            <span class="input-group-btn" uib-tooltip="Copy License Number" tooltip-placement="left">
+                                <button class="btn btn-default btn-flat" type="button" ngclipboard
+                                        ngclipboard-error="clipboardError(e)" data-clipboard-target="#identityLicenseNumber">
+                                    <i class="fa fa-clipboard"></i>
+                                </button>
+                            </span>
+                        </div>
+                    </div>
+                </div>
             </div>
             <div class="row">
                 <div class="col-sm-6">