diff --git a/lib/src/visual/views/onboarding/setup/backup.setup.dart b/lib/src/visual/views/onboarding/setup/backup.setup.dart
index 1ad0ab41..659c0357 100644
--- a/lib/src/visual/views/onboarding/setup/backup.setup.dart
+++ b/lib/src/visual/views/onboarding/setup/backup.setup.dart
@@ -2,7 +2,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:go_router/go_router.dart';
-import 'package:twonly/locator.dart';
 import 'package:twonly/src/constants/routes.keys.dart';
 import 'package:twonly/src/services/backup/common.backup.dart';
 import 'package:twonly/src/services/user.service.dart';
@@ -24,19 +23,6 @@ class _BackupSetupPageState extends State<BackupSetupPage> {
   final TextEditingController passwordCtrl = TextEditingController();
   final TextEditingController repeatedPasswordCtrl = TextEditingController();
 
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (userService.currentUser.twonlySafeBackup != null) {
-        // twonly safe is already configured...
-        UserService.update((user) {
-          user.currentSetupPage = SetupPages.backup.next()?.name;
-        });
-      }
-    });
-  }
-
   Future<bool> onPressedEnableTwonlySafe() async {
     setState(() {
       isLoading = true;
diff --git a/lib/src/visual/views/onboarding/setup/let_your_friends_find_you.setup.dart b/lib/src/visual/views/onboarding/setup/let_your_friends_find_you.setup.dart
index ed65698b..05e60f50 100644
--- a/lib/src/visual/views/onboarding/setup/let_your_friends_find_you.setup.dart
+++ b/lib/src/visual/views/onboarding/setup/let_your_friends_find_you.setup.dart
@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:lottie/lottie.dart';
 import 'package:twonly/locator.dart';
-import 'package:twonly/src/services/user.service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/visual/views/onboarding/setup.view.dart';
 import 'package:twonly/src/visual/views/onboarding/setup/components/next_button.comp.dart';
 import 'package:twonly/src/visual/views/settings/privacy/user_discovery/components/user_discovery_setup.comp.dart';
 
@@ -19,21 +17,6 @@ class LetYourFriendsFindYou extends StatefulWidget {
 class _LetYourFriendsFindYouState extends State<LetYourFriendsFindYou> {
   bool _isLoading = false;
 
-  @override
-  void initState() {
-    super.initState();
-
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (userService.currentUser.isUserDiscoveryEnabled &&
-          userService.currentUser.userDiscoverySharePromotion) {
-        // feature is already configured...
-        UserService.update((user) {
-          user.currentSetupPage = SetupPages.letYourFriendsFindYou.next()?.name;
-        });
-      }
-    });
-  }
-
   @override
   Widget build(BuildContext context) {
     return Center(
diff --git a/lib/src/visual/views/onboarding/setup/share_your_friends.setup.dart b/lib/src/visual/views/onboarding/setup/share_your_friends.setup.dart
index c2b6220e..27971806 100644
--- a/lib/src/visual/views/onboarding/setup/share_your_friends.setup.dart
+++ b/lib/src/visual/views/onboarding/setup/share_your_friends.setup.dart
@@ -1,7 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:twonly/locator.dart';
-import 'package:twonly/src/services/user.service.dart';
-import 'package:twonly/src/visual/views/onboarding/setup.view.dart';
 import 'package:twonly/src/visual/views/onboarding/setup/components/next_button.comp.dart';
 import 'package:twonly/src/visual/views/settings/privacy/user_discovery/components/user_discovery_setup.comp.dart';
 
@@ -16,20 +13,6 @@ class ShareYourFriendsSetupPage extends StatefulWidget {
 }
 
 class _ShareYourFriendsSetupPageState extends State<ShareYourFriendsSetupPage> {
-  @override
-  void initState() {
-    super.initState();
-
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (userService.currentUser.isUserDiscoveryEnabled) {
-        // feature is already configured...
-        UserService.update((user) {
-          user.currentSetupPage = SetupPages.shareYourFriends.next()?.name;
-        });
-      }
-    });
-  }
-
   @override
   Widget build(BuildContext context) {
     return Center(
@@ -41,11 +24,7 @@ class _ShareYourFriendsSetupPageState extends State<ShareYourFriendsSetupPage> {
             showOnlySpecificPage: UserDiscoveryPages.shareYourFriends,
           ),
           const SizedBox(height: 60),
-          const NextButtonComp(
-            // onPressed: () async {
-            //   return !(await widget.state.initializeOrUpdate());
-            // },
-          ),
+          const NextButtonComp(),
         ],
       ),
     );
diff --git a/rust/src/bridge/callbacks/user_discovery.rs b/rust/src/bridge/callbacks/user_discovery.rs
index 5d57b4bc..1a24fb94 100644
--- a/rust/src/bridge/callbacks/user_discovery.rs
+++ b/rust/src/bridge/callbacks/user_discovery.rs
@@ -46,7 +46,7 @@ impl UserDiscoveryUtils for UserDiscoveryUtilsFlutter {
 
 impl UserDiscoveryStore for UserDiscoveryStoreFlutter {
     async fn get_config(&self) -> Result<String> {
-        let ws = get_twonly_flutter().unwrap();
+        let ws = get_twonly_flutter()?;
         let config_path =
             PathBuf::from(&ws.config.data_directory).join("user_discovery_config.json");
 
@@ -59,7 +59,7 @@ impl UserDiscoveryStore for UserDiscoveryStoreFlutter {
 
     async fn update_config(&self, update: String) -> Result<()> {
         tracing::debug!("Updating configuration file.");
-        let ws = get_twonly_flutter().unwrap();
+        let ws = get_twonly_flutter()?;
         let config_path =
             PathBuf::from(&ws.config.data_directory).join("user_discovery_config.json");
         std::fs::write(config_path, &update)?;