diff --git a/frontend/app/components/Header/HealthStatus/HealthModal/HealthModal.tsx b/frontend/app/components/Header/HealthStatus/HealthModal/HealthModal.tsx
index b0bbb8969..a78ba4ad1 100644
--- a/frontend/app/components/Header/HealthStatus/HealthModal/HealthModal.tsx
+++ b/frontend/app/components/Header/HealthStatus/HealthModal/HealthModal.tsx
@@ -34,6 +34,7 @@ function HealthModal({
   const handleClose = () => {
     setShowModal(false);
   };
+
   return (
     <div
       style={{
@@ -103,7 +104,7 @@ function HealthModal({
           </div>
         </div>
         <div className={'p-4 mt-auto w-full border-t border-figmaColors-divider'}>
-          <Button variant={'primary'} className={'ml-auto'}>
+          <Button disabled={!healthResponse.overallHealth} loading={isLoading} variant={'primary'} className={'ml-auto'}>
             Create Account
           </Button>
         </div>
diff --git a/frontend/app/components/Header/HealthStatus/HealthWidget.tsx b/frontend/app/components/Header/HealthStatus/HealthWidget.tsx
index c6372540b..50b4de76d 100644
--- a/frontend/app/components/Header/HealthStatus/HealthWidget.tsx
+++ b/frontend/app/components/Header/HealthStatus/HealthWidget.tsx
@@ -79,6 +79,7 @@ function HealthWidget({
                     onClick={() => setShowModal(true)}
                     healthOk={false}
                     name={service.name}
+                    isSelectable
                   />
                 </React.Fragment>
               ))}