diff --git a/apps/console/public/logos/hipaa.png b/apps/console/public/logos/hipaa.png
new file mode 100644
index 000000000..4a8a23df8
Binary files /dev/null and b/apps/console/public/logos/hipaa.png differ
diff --git a/apps/console/src/components/FrameworkLogo.tsx b/apps/console/src/components/FrameworkLogo.tsx
index a727f7ea5..eadd2de8f 100644
--- a/apps/console/src/components/FrameworkLogo.tsx
+++ b/apps/console/src/components/FrameworkLogo.tsx
@@ -8,7 +8,7 @@ const availableLogos = new Map(
 export function FrameworkLogo({ name }: { name: string }) {
   const logo = availableLogos.get(name);
   return logo ? (
-    <img src={logo} alt="" className="size-12" />
+    <img src={logo} alt="" className="h-12" />
   ) : (
     <Avatar name={name} size="l" className="size-12" />
   );
diff --git a/apps/console/src/pages/organizations/frameworks/FrameworkDetailPage.tsx b/apps/console/src/pages/organizations/frameworks/FrameworkDetailPage.tsx
index 159c540c5..5e6af3b36 100644
--- a/apps/console/src/pages/organizations/frameworks/FrameworkDetailPage.tsx
+++ b/apps/console/src/pages/organizations/frameworks/FrameworkDetailPage.tsx
@@ -83,7 +83,7 @@ export default function FrameworkDetailPage(props: Props) {
   const controls = framework.controls.edges.map((edge) => edge.node);
   const selectedControl = controlId
     ? controls.find((control) => control.id === controlId)
-    : controls[0];
+    : controls[0] || null;
   const connectionId = framework.controls.__id;
   const deleteFramework = useDeleteFrameworkMutation(
     framework,
@@ -109,7 +109,7 @@ export default function FrameworkDetailPage(props: Props) {
     });
   };
 
-  if (!controlId) {
+  if (!controlId && controls.length > 0) {
     return (
       <Navigate
         to={`/organizations/${organizationId}/frameworks/${framework.id}/controls/${controls[0].id}`}
diff --git a/packages/helpers/src/frameworks.ts b/packages/helpers/src/frameworks.ts
index a6423c6b7..5d97b04a3 100644
--- a/packages/helpers/src/frameworks.ts
+++ b/packages/helpers/src/frameworks.ts
@@ -12,15 +12,9 @@ export const availableFrameworks = [
         description: "System and Organization Controls 2",
     },
     {
-        id: "GDPR",
-        name: "GDPR",
-        logo: "/logos/gdpr.png",
-        description: "General Data Protection Regulation",
-    },
-    {
-        id: "SOX",
-        name: "SOX",
-        logo: "/logos/sox.png",
-        description: "Sarbanes-Oxley Act",
+        id: "HIPAA",
+        name: "HIPAA",
+        logo: "/logos/hipaa.png",
+        description: "Health Insurance Portability and Accountability Act",
     },
 ];
diff --git a/pkg/probo/control_service.go b/pkg/probo/control_service.go
index 592c16c94..27ffeb5d3 100644
--- a/pkg/probo/control_service.go
+++ b/pkg/probo/control_service.go
@@ -31,11 +31,13 @@ type (
 	}
 
 	CreateControlRequest struct {
-		ID           gid.GID
-		FrameworkID  gid.GID
-		Name         string
-		Description  string
-		SectionTitle string
+		ID                     gid.GID
+		FrameworkID            gid.GID
+		Name                   string
+		Description            string
+		SectionTitle           string
+		Status                 *coredata.ControlStatus
+		ExclusionJustification *string
 	}
 
 	UpdateControlRequest struct {
@@ -498,14 +500,16 @@ func (s ControlService) Create(
 	framework := &coredata.Framework{}
 
 	control := &coredata.Control{
-		ID:           gid.New(s.svc.scope.GetTenantID(), coredata.ControlEntityType),
-		FrameworkID:  req.FrameworkID,
-		TenantID:     s.svc.scope.GetTenantID(),
-		Name:         req.Name,
-		Description:  req.Description,
-		SectionTitle: req.SectionTitle,
-		CreatedAt:    now,
-		UpdatedAt:    now,
+		ID:                     gid.New(s.svc.scope.GetTenantID(), coredata.ControlEntityType),
+		FrameworkID:            req.FrameworkID,
+		TenantID:               s.svc.scope.GetTenantID(),
+		Name:                   req.Name,
+		Description:            req.Description,
+		SectionTitle:           req.SectionTitle,
+		Status:                 *req.Status,
+		ExclusionJustification: req.ExclusionJustification,
+		CreatedAt:              now,
+		UpdatedAt:              now,
 	}
 
 	err := s.svc.pg.WithTx(
diff --git a/pkg/server/api/console/v1/schema.graphql b/pkg/server/api/console/v1/schema.graphql
index 6312138d8..319e0e081 100644
--- a/pkg/server/api/console/v1/schema.graphql
+++ b/pkg/server/api/console/v1/schema.graphql
@@ -1761,7 +1761,7 @@ input CreateControlInput {
   sectionTitle: String!
   name: String!
   description: String!
-  status: ControlStatus
+  status: ControlStatus!
   exclusionJustification: String
 }
 
diff --git a/pkg/server/api/console/v1/schema/schema.go b/pkg/server/api/console/v1/schema/schema.go
index 5a8c94c6e..bb9b3f84a 100644
--- a/pkg/server/api/console/v1/schema/schema.go
+++ b/pkg/server/api/console/v1/schema/schema.go
@@ -6718,7 +6718,7 @@ input CreateControlInput {
   sectionTitle: String!
   name: String!
   description: String!
-  status: ControlStatus
+  status: ControlStatus!
   exclusionJustification: String
 }
 
@@ -38150,7 +38150,7 @@ func (ec *executionContext) unmarshalInputCreateControlInput(ctx context.Context
 			it.Description = data
 		case "status":
 			ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("status"))
-			data, err := ec.unmarshalOControlStatus2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐControlStatus(ctx, v)
+			data, err := ec.unmarshalNControlStatus2githubᚗcomᚋgetproboᚋproboᚋpkgᚋcoredataᚐControlStatus(ctx, v)
 			if err != nil {
 				return it, err
 			}
diff --git a/pkg/server/api/console/v1/types/types.go b/pkg/server/api/console/v1/types/types.go
index e0df503ac..d0f1df697 100644
--- a/pkg/server/api/console/v1/types/types.go
+++ b/pkg/server/api/console/v1/types/types.go
@@ -169,12 +169,12 @@ type CreateControlDocumentMappingPayload struct {
 }
 
 type CreateControlInput struct {
-	FrameworkID            gid.GID                 `json:"frameworkId"`
-	SectionTitle           string                  `json:"sectionTitle"`
-	Name                   string                  `json:"name"`
-	Description            string                  `json:"description"`
-	Status                 *coredata.ControlStatus `json:"status,omitempty"`
-	ExclusionJustification *string                 `json:"exclusionJustification,omitempty"`
+	FrameworkID            gid.GID                `json:"frameworkId"`
+	SectionTitle           string                 `json:"sectionTitle"`
+	Name                   string                 `json:"name"`
+	Description            string                 `json:"description"`
+	Status                 coredata.ControlStatus `json:"status"`
+	ExclusionJustification *string                `json:"exclusionJustification,omitempty"`
 }
 
 type CreateControlMeasureMappingInput struct {
diff --git a/pkg/server/api/console/v1/v1_resolver.go b/pkg/server/api/console/v1/v1_resolver.go
index fbd4accfb..2c76fc59b 100644
--- a/pkg/server/api/console/v1/v1_resolver.go
+++ b/pkg/server/api/console/v1/v1_resolver.go
@@ -1201,10 +1201,12 @@ func (r *mutationResolver) CreateControl(ctx context.Context, input types.Create
 	prb := r.ProboService(ctx, input.FrameworkID.TenantID())
 
 	control, err := prb.Controls.Create(ctx, probo.CreateControlRequest{
-		FrameworkID:  input.FrameworkID,
-		Name:         input.Name,
-		Description:  input.Description,
-		SectionTitle: input.SectionTitle,
+		FrameworkID:            input.FrameworkID,
+		Name:                   input.Name,
+		Description:            input.Description,
+		SectionTitle:           input.SectionTitle,
+		Status:                 &input.Status,
+		ExclusionJustification: input.ExclusionJustification,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("cannot create control: %w", err)