diff --git a/src/Api/Controllers/CiphersController.cs b/src/Api/Controllers/CiphersController.cs
index 0352300acb..4229aa0183 100644
--- a/src/Api/Controllers/CiphersController.cs
+++ b/src/Api/Controllers/CiphersController.cs
@@ -92,7 +92,7 @@ namespace Bit.Api.Controllers
             IEnumerable<CipherDetails> ciphers;
             if(type.HasValue)
             {
-                ciphers = await _cipherRepository.GetManyByTypeAndUserIdAsync(Core.Enums.CipherType.Login, userId);
+                ciphers = await _cipherRepository.GetManyByTypeAndUserIdAsync(type.Value, userId);
             }
             else
             {
diff --git a/src/Core/Models/Api/IdentityDataModel.cs b/src/Core/Models/Api/IdentityDataModel.cs
index f7e4f3e52d..990e233eaa 100644
--- a/src/Core/Models/Api/IdentityDataModel.cs
+++ b/src/Core/Models/Api/IdentityDataModel.cs
@@ -22,13 +22,16 @@ namespace Bit.Core.Models.Api
             Address2 = cipher.Identity.Address2;
             Address3 = cipher.Identity.Address3;
             City = cipher.Identity.City;
-            State = cipher.Identity.City;
+            State = cipher.Identity.State;
             PostalCode = cipher.Identity.PostalCode;
             Country = cipher.Identity.Country;
             Company = cipher.Identity.Company;
             Email = cipher.Identity.Email;
             Phone = cipher.Identity.Phone;
             SSN = cipher.Identity.SSN;
+            Username = cipher.Identity.Username;
+            PassportNumber = cipher.Identity.PassportNumber;
+            LicenseNumber = cipher.Identity.LicenseNumber;
         }
 
         public IdentityDataModel(Cipher cipher)
@@ -59,6 +62,9 @@ namespace Bit.Core.Models.Api
             Email = data.Email;
             Phone = data.Phone;
             SSN = data.SSN;
+            Username = data.Username;
+            PassportNumber = data.PassportNumber;
+            LicenseNumber = data.LicenseNumber;
         }
 
         public string Title { get; set; }
@@ -76,5 +82,8 @@ namespace Bit.Core.Models.Api
         public string Email { get; set; }
         public string Phone { get; set; }
         public string SSN { get; set; }
+        public string Username { get; set; }
+        public string PassportNumber { get; set; }
+        public string LicenseNumber { get; set; }
     }
 }
diff --git a/src/Core/Models/Api/Request/CipherRequestModel.cs b/src/Core/Models/Api/Request/CipherRequestModel.cs
index 6fa7172b00..97d75c81af 100644
--- a/src/Core/Models/Api/Request/CipherRequestModel.cs
+++ b/src/Core/Models/Api/Request/CipherRequestModel.cs
@@ -207,6 +207,15 @@ namespace Bit.Core.Models.Api
             [EncryptedString]
             [StringLength(1000)]
             public string SSN { get; set; }
+            [EncryptedString]
+            [StringLength(1000)]
+            public string Username { get; set; }
+            [EncryptedString]
+            [StringLength(1000)]
+            public string PassportNumber { get; set; }
+            [EncryptedString]
+            [StringLength(1000)]
+            public string LicenseNumber { get; set; }
         }
 
         public class SecureNoteType
diff --git a/src/Core/Models/Api/Response/CipherResponseModel.cs b/src/Core/Models/Api/Response/CipherResponseModel.cs
index 1c64b3e5ed..c1e81b98f7 100644
--- a/src/Core/Models/Api/Response/CipherResponseModel.cs
+++ b/src/Core/Models/Api/Response/CipherResponseModel.cs
@@ -34,6 +34,9 @@ namespace Bit.Core.Models.Api
                 case Enums.CipherType.Card:
                     Data = new CardDataModel(cipher);
                     break;
+                case Enums.CipherType.Identity:
+                    Data = new IdentityDataModel(cipher);
+                    break;
                 default:
                     throw new ArgumentException("Unsupported " + nameof(Type) + ".");
             }