diff --git a/app/lib/screens/wizard/page5.dart b/app/lib/screens/wizard/page5.dart
index 8255fc46..16141c67 100644
--- a/app/lib/screens/wizard/page5.dart
+++ b/app/lib/screens/wizard/page5.dart
@@ -2,7 +2,6 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:provider/provider.dart';
-import 'package:threebotlogin/screens/main_screen.dart';
 import 'package:threebotlogin/screens/wizard/web_view.dart';
 import 'package:threebotlogin/services/shared_preference_service.dart';
 import 'package:threebotlogin/widgets/wizard/terms_agreement.dart';
@@ -64,11 +63,7 @@ class _Page5State extends State<Page5> {
                         termsAgreement.attemptToContinue();
                       } else {
                         saveInitDone();
-                        await Navigator.of(context).push(MaterialPageRoute(
-                            builder: (context) => const MainScreen(
-                                  initDone: true,
-                                  registered: false,
-                                )));
+                        Navigator.pop(context, true);
                       }
                     },
                     style: ElevatedButton.styleFrom(
diff --git a/app/lib/widgets/wizard/terms_and_conditions.dart b/app/lib/widgets/wizard/terms_and_conditions.dart
index e9f45093..ccfe2df7 100644
--- a/app/lib/widgets/wizard/terms_and_conditions.dart
+++ b/app/lib/widgets/wizard/terms_and_conditions.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:threebotlogin/screens/main_screen.dart';
 import 'package:threebotlogin/screens/wizard/web_view.dart';
 import 'package:threebotlogin/services/shared_preference_service.dart';
 import 'package:threebotlogin/widgets/custom_dialog.dart';
@@ -75,13 +74,7 @@ class _TermsAndConditionsState extends State<TermsAndConditions> {
             } else {
               saveInitDone();
               Navigator.of(context).pop();
-              await Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                      builder: (context) => const MainScreen(
-                            initDone: true,
-                            registered: false,
-                          )));
+              Navigator.pop(context, true);
             }
           },
           child: const Text('Continue'),