diff --git a/frontend/src/views/Project/CertificatesPage/components/CaTab/components/CaModal.tsx b/frontend/src/views/Project/CertificatesPage/components/CaTab/components/CaModal.tsx
index a08168d3e..c32eaa9f1 100644
--- a/frontend/src/views/Project/CertificatesPage/components/CaTab/components/CaModal.tsx
+++ b/frontend/src/views/Project/CertificatesPage/components/CaTab/components/CaModal.tsx
@@ -204,6 +204,11 @@ export const CaModal = ({ popUp, handlePopUpToggle }: Props) => {
     >
       <ModalContent title={`${ca ? "View" : "Create"} Private CA`}>
         <form onSubmit={handleSubmit(onFormSubmit)}>
+          {ca && (
+            <FormControl label="CA ID">
+              <Input value={ca.id} isDisabled className="bg-white/[0.07]" />
+            </FormControl>
+          )}
           <Controller
             control={control}
             name="type"
diff --git a/frontend/src/views/Project/CertificatesPage/components/CertificatesTab/components/CertificateModal.tsx b/frontend/src/views/Project/CertificatesPage/components/CertificatesTab/components/CertificateModal.tsx
index 40645a07e..a5520c3c3 100644
--- a/frontend/src/views/Project/CertificatesPage/components/CertificatesTab/components/CertificateModal.tsx
+++ b/frontend/src/views/Project/CertificatesPage/components/CertificatesTab/components/CertificateModal.tsx
@@ -218,7 +218,6 @@ export const CertificateModal = ({ popUp, handlePopUpToggle }: Props) => {
                   }
                   errorText={error?.message}
                   isError={Boolean(error)}
-                  className="mt-4"
                   isRequired
                 >
                   <Select
diff --git a/frontend/src/views/Project/CertificatesPage/components/CertificatesTab/components/CertificateTemplateModal.tsx b/frontend/src/views/Project/CertificatesPage/components/CertificatesTab/components/CertificateTemplateModal.tsx
index 8074cbaf5..1910a5f7b 100644
--- a/frontend/src/views/Project/CertificatesPage/components/CertificatesTab/components/CertificateTemplateModal.tsx
+++ b/frontend/src/views/Project/CertificatesPage/components/CertificatesTab/components/CertificateTemplateModal.tsx
@@ -132,8 +132,6 @@ export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Pro
           subjectAlternativeName,
           ttl
         });
-        
-        // TODO: requireTemplateForIssuance field
 
         createNotification({
           text: "Successfully updated certificate template",
@@ -177,6 +175,11 @@ export const CertificateTemplateModal = ({ popUp, handlePopUpToggle, caId }: Pro
     >
       <ModalContent title={certTemplate ? "Certificate Template" : "Create Certificate Template"}>
         <form onSubmit={handleSubmit(onFormSubmit)}>
+          {certTemplate && (
+            <FormControl label="Certificate Template ID">
+              <Input value={certTemplate.id} isDisabled className="bg-white/[0.07]" />
+            </FormControl>
+          )}
           <Controller
             control={control}
             defaultValue=""