diff --git a/lemur/schemas.py b/lemur/schemas.py
index 4574a5a0..a9e91e2b 100644
--- a/lemur/schemas.py
+++ b/lemur/schemas.py
@@ -170,12 +170,9 @@ class BasicConstraintsSchema(BaseExtensionSchema):
     pass
 
 
-class AuthorityIdentifierSchema(BaseExtensionSchema):
-    use_authority_cert = fields.Boolean()
-
-
 class AuthorityKeyIdentifierSchema(BaseExtensionSchema):
     use_key_identifier = fields.Boolean()
+    use_authority_cert = fields.Boolean()
 
 
 class CertificateInfoAccessSchema(BaseExtensionSchema):
@@ -240,7 +237,6 @@ class ExtensionSchema(BaseExtensionSchema):
     extended_key_usage = fields.Nested(ExtendedKeyUsageSchema)
     subject_key_identifier = fields.Nested(SubjectKeyIdentifierSchema)
     sub_alt_names = fields.Nested(SubAltNamesSchema)
-    authority_identifier = fields.Nested(AuthorityIdentifierSchema)
     authority_key_identifier = fields.Nested(AuthorityKeyIdentifierSchema)
     certificate_info_access = fields.Nested(CertificateInfoAccessSchema)
     custom = fields.List(fields.Nested(CustomOIDSchema))
diff --git a/lemur/static/app/angular/certificates/certificate/options.tpl.html b/lemur/static/app/angular/certificates/certificate/options.tpl.html
index e0da155e..c38eb863 100644
--- a/lemur/static/app/angular/certificates/certificate/options.tpl.html
+++ b/lemur/static/app/angular/certificates/certificate/options.tpl.html
@@ -184,15 +184,13 @@
           <div class="checkbox">
             <label tooltip-trigger="mouseenter" tooltip-placement="top"
                    uib-tooltip="Put Issuer's keyIdentifier in this extension">
-              <input type="checkbox" ng-model="certificate.extensions.authorityKeyIdentifier.useKeyIdentifier">Key
-              Identifier
+              <input type="checkbox" ng-model="certificate.extensions.authorityKeyIdentifier.useKeyIdentifier">Key Identifier
             </label>
           </div>
           <div class="checkbox">
             <label tooltip-trigger="mouseenter" tooltip-placement="top"
                    uib-tooltip="Put Issuer's Name and Serial number">
-              <input type="checkbox" ng-model="certificate.extensions.authorityIdentifier.useAuthorityCert">Authority
-              Certificate
+              <input type="checkbox" ng-model="certificate.extensions.authorityKeyIdentifier.useAuthorityCert">Authority Certificate
             </label>
           </div>
         </div>
diff --git a/lemur/tests/test_certificates.py b/lemur/tests/test_certificates.py
index cf9b01ec..25fc9b31 100644
--- a/lemur/tests/test_certificates.py
+++ b/lemur/tests/test_certificates.py
@@ -65,27 +65,19 @@ def test_certificate_edit_schema(session):
     assert len(data['notifications']) == 3
 
 
-def test_authority_identifier_schema():
-    from lemur.schemas import AuthorityIdentifierSchema
-    input_data = {'useAuthorityCert': True}
-
-    data, errors = AuthorityIdentifierSchema().load(input_data)
-
-    assert data == {'use_authority_cert': True}
-    assert not errors
-
-    data, errors = AuthorityIdentifierSchema().dumps(data)
-    assert not errors
-    assert data == json.dumps(input_data)
-
-
 def test_authority_key_identifier_schema():
     from lemur.schemas import AuthorityKeyIdentifierSchema
-    input_data = {'useKeyIdentifier': True}
+    input_data = {
+        'useKeyIdentifier': True,
+        'useAuthorityCert': True
+    }
 
     data, errors = AuthorityKeyIdentifierSchema().load(input_data)
 
-    assert data == {'use_key_identifier': True}
+    assert data == {
+        'use_key_identifier': True,
+        'use_authority_cert': True
+    }
     assert not errors
 
     data, errors = AuthorityKeyIdentifierSchema().dumps(data)