diff --git a/lib/view_model/node_list/node_create_or_edit_view_model.dart b/lib/view_model/node_list/node_create_or_edit_view_model.dart
index 6fb627011..2fca12e95 100644
--- a/lib/view_model/node_list/node_create_or_edit_view_model.dart
+++ b/lib/view_model/node_list/node_create_or_edit_view_model.dart
@@ -1,6 +1,7 @@
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/entities/qr_scanner.dart';
 import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cw_core/utils/print_verbose.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
@@ -215,7 +216,6 @@ abstract class NodeCreateOrEditViewModelBase with Store {
           await PermissionHandler.checkPermission(Permission.camera, context);
       if (!isCameraPermissionGranted) return;
       String code = await presentQRScanner(context);
-
       if (code.isEmpty) {
         throw Exception('Unexpected scan QR code value: value is empty');
       }
@@ -228,12 +228,12 @@ abstract class NodeCreateOrEditViewModelBase with Store {
       }
 
       final userInfo = uri.userInfo;
+      final rpcUser = userInfo.length == 2 ? userInfo[0] : '';
+      final rpcPassword = userInfo.length == 2 ? userInfo[1] : '';
       final ipAddress = uri.host;
       final port = uri.hasPort ? uri.port.toString() : '';
       final path = uri.path;
       final queryParams = uri.queryParameters; // Currently not used
-      final rpcUser = userInfo.split(':').first;
-      final rpcPassword = userInfo.split(':').length > 1 ? userInfo.split(':')[1] : '';
 
       await Future.delayed(Duration(milliseconds: 345));
 
diff --git a/pubspec_base.yaml b/pubspec_base.yaml
index 3b6112fce..72c17a079 100644
--- a/pubspec_base.yaml
+++ b/pubspec_base.yaml
@@ -17,7 +17,7 @@ dependencies:
   fast_scanner:
     git:
       url: https://github.com/MrCyjaneK/fast_scanner
-      ref: c5a08720216a508bf1fe3d062ad19d2836545a42
+      ref: 69b3276b090fa6ac01b4483ca3adca93a8e615be
   http: ^1.1.0
   path_provider: ^2.0.11
   mobx: ^2.1.4