diff --git a/modules/ui/src/app/pages/risk-assessment/components/success-dialog/success-dialog.component.html b/modules/ui/src/app/pages/risk-assessment/components/success-dialog/success-dialog.component.html
index 956db409a..b45e0b881 100644
--- a/modules/ui/src/app/pages/risk-assessment/components/success-dialog/success-dialog.component.html
+++ b/modules/ui/src/app/pages/risk-assessment/components/success-dialog/success-dialog.component.html
@@ -20,7 +20,7 @@
 </p>
 <p class="simple-dialog-content">
   <span class="simple-dialog-content-risk"
-    >Preliminary risk estimation based on your answers is
+    >The preliminary risk estimation based on your answers is
     <span
       *ngIf="data.profile.risk"
       class="profile-item-risk"
@@ -39,6 +39,6 @@
     color="primary"
     mat-button
     type="button">
-    Confirm
+    Close
   </button>
 </mat-dialog-actions>
diff --git a/modules/ui/src/app/pages/risk-assessment/components/success-dialog/success-dialog.component.spec.ts b/modules/ui/src/app/pages/risk-assessment/components/success-dialog/success-dialog.component.spec.ts
index 79d200852..e81deb7ca 100644
--- a/modules/ui/src/app/pages/risk-assessment/components/success-dialog/success-dialog.component.spec.ts
+++ b/modules/ui/src/app/pages/risk-assessment/components/success-dialog/success-dialog.component.spec.ts
@@ -71,10 +71,10 @@ describe('SuccessDialogComponent', () => {
 
   it('should return proper text for risk', () => {
     expect(component.getRiskExplanation(ProfileRisk.LIMITED)).toEqual(
-      'This means that your device might be eligible for most networks.'
+      'This means that your device is eligible for most networks.'
     );
     expect(component.getRiskExplanation(ProfileRisk.HIGH)).toEqual(
-      'This means that your device might be eligible only for some networks.'
+      'This means that your device is eligible only for some networks.'
     );
   });
 });
diff --git a/modules/ui/src/app/pages/risk-assessment/components/success-dialog/success-dialog.component.ts b/modules/ui/src/app/pages/risk-assessment/components/success-dialog/success-dialog.component.ts
index 244d7431f..baf798a04 100644
--- a/modules/ui/src/app/pages/risk-assessment/components/success-dialog/success-dialog.component.ts
+++ b/modules/ui/src/app/pages/risk-assessment/components/success-dialog/success-dialog.component.ts
@@ -59,7 +59,7 @@ export class SuccessDialogComponent extends EscapableDialogComponent {
 
   getRiskExplanation(risk: string | undefined) {
     return risk === ProfileRisk.LIMITED
-      ? 'This means that your device might be eligible for most networks.'
-      : 'This means that your device might be eligible only for some networks.';
+      ? 'This means that your device is eligible for most networks.'
+      : 'This means that your device is eligible only for some networks.';
   }
 }
diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
index a756806a5..020a656bb 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
@@ -162,7 +162,9 @@ export class RiskAssessmentComponent implements OnInit, OnDestroy {
     this.store.saveProfile({
       profile,
       onSave: (profile: Profile) => {
-        this.openSuccessDialog(profile);
+        if (profile.status === ProfileStatus.VALID) {
+          this.openSuccessDialog(profile);
+        }
       },
     });
     this.isOpenProfileForm = false;