diff --git a/lib/di.dart b/lib/di.dart
index 8dfbfd788..b7f8ce949 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -343,7 +343,7 @@ Future setup(
               onAuthenticationFinished: onAuthFinished,
               closable: closable ?? false));
 
-  getIt.registerFactory(() => 
+  getIt.registerFactory(() =>
    BalancePage(dashboardViewModel: getIt.get<DashboardViewModel>(), settingsStore: getIt.get<SettingsStore>()));
 
   getIt.registerFactory<DashboardPage>(() => DashboardPage( balancePage: getIt.get<BalancePage>(), walletViewModel: getIt.get<DashboardViewModel>(), addressListViewModel: getIt.get<WalletAddressListViewModel>()));
@@ -478,8 +478,9 @@ Future setup(
 
   getIt.registerFactory(() => NodeListPage(getIt.get<NodeListViewModel>()));
 
-  getIt.registerFactory(() =>
-      NodeCreateOrEditViewModel(_nodeSource, getIt.get<AppStore>().wallet));
+  getIt.registerFactoryParam<NodeCreateOrEditViewModel, WalletType, void>(
+      (WalletType type, _) =>
+          NodeCreateOrEditViewModel(_nodeSource, type ?? getIt.get<AppStore>().wallet.type));
 
   getIt.registerFactory(
       () => NodeCreateOrEditPage(getIt.get<NodeCreateOrEditViewModel>()));
@@ -672,7 +673,7 @@ Future setup(
 
   getIt.registerFactoryParam<FullscreenQRPage, String, bool>(
           (String qrData, bool isLight) => FullscreenQRPage(qrData: qrData, isLight: isLight,));
-  
+
   getIt.registerFactory(() => IoniaApi());
 
   getIt.registerFactory(() => AnyPayApi());
@@ -692,7 +693,7 @@ Future setup(
 
   getIt.registerFactoryParam<IoniaMerchPurchaseViewModel, double, IoniaMerchant>((double amount, merchant) {
     return IoniaMerchPurchaseViewModel(
-      ioniaAnyPayService: getIt.get<IoniaAnyPay>(), 
+      ioniaAnyPayService: getIt.get<IoniaAnyPay>(),
       amount: amount,
       ioniaMerchant: merchant,
     );
@@ -734,31 +735,31 @@ Future setup(
       ioniaService: getIt.get<IoniaService>(),
       giftCard: giftCard);
   });
- 
+
  getIt.registerFactoryParam<IoniaCustomTipViewModel, List, void>((List args, _) {
      final amount = args[0] as double;
      final merchant = args[1] as IoniaMerchant;
      final tip = args[2] as IoniaTip;
-     
+
      return IoniaCustomTipViewModel(amount: amount, tip: tip, ioniaMerchant: merchant);
   });
-  
+
   getIt.registerFactoryParam<IoniaGiftCardDetailPage, IoniaGiftCard, void>((IoniaGiftCard giftCard, _) {
      return IoniaGiftCardDetailPage(getIt.get<IoniaGiftCardDetailsViewModel>(param1: giftCard));
   });
 
   getIt.registerFactoryParam<IoniaMoreOptionsPage, List, void>((List args, _){
     final giftCard = args.first as IoniaGiftCard;
-  
-    return IoniaMoreOptionsPage(giftCard); 
+
+    return IoniaMoreOptionsPage(giftCard);
   });
 
   getIt.registerFactoryParam<IoniaCustomRedeemViewModel, IoniaGiftCard, void>((IoniaGiftCard giftCard, _) => IoniaCustomRedeemViewModel(giftCard));
 
   getIt.registerFactoryParam<IoniaCustomRedeemPage, List, void>((List args, _){
     final giftCard = args.first as IoniaGiftCard;
-  
-    return IoniaCustomRedeemPage(getIt.get<IoniaCustomRedeemViewModel>(param1: giftCard) ); 
+
+    return IoniaCustomRedeemPage(getIt.get<IoniaCustomRedeemViewModel>(param1: giftCard) );
   });
 
 
diff --git a/lib/router.dart b/lib/router.dart
index b19fb198e..fd820b764 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -20,6 +20,7 @@ import 'package:cake_wallet/src/screens/support/support_page.dart';
 import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_details_page.dart';
 import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_list_page.dart';
 import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart';
+import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
 import 'package:cake_wallet/view_model/privacy_settings_view_model.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -476,9 +477,10 @@ Route<dynamic> createRoute(RouteSettings settings) {
     case Routes.privacySettings:
       final type = settings.arguments as WalletType;
       final privacySettingsViewModel = getIt.get<PrivacySettingsViewModel>(param1: type);
+      final nodeCreateViewModel = getIt.get<NodeCreateOrEditViewModel>(param1: type);
 
       return CupertinoPageRoute<void>(
-          builder: (_) => AdvancedPrivacySettingsPage(privacySettingsViewModel));
+          builder: (_) => AdvancedPrivacySettingsPage(privacySettingsViewModel, nodeCreateViewModel));
 
     default:
       return MaterialPageRoute<void>(
diff --git a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
index 149b65d2e..e22afeb92 100644
--- a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+++ b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
@@ -1,49 +1,50 @@
-import 'package:cake_wallet/entities/generate_name.dart';
+import 'package:cake_wallet/src/screens/nodes/widgets/node_form.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
+import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
 import 'package:cake_wallet/view_model/privacy_settings_view_model.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/core/wallet_name_validator.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 
 class AdvancedPrivacySettingsPage extends BasePage {
-  AdvancedPrivacySettingsPage(this.privacySettingsViewModel);
+  AdvancedPrivacySettingsPage(this.privacySettingsViewModel, this.nodeViewModel);
 
   final PrivacySettingsViewModel privacySettingsViewModel;
+  final NodeCreateOrEditViewModel nodeViewModel;
 
   @override
   String get title => S.current.privacy_settings;
 
   @override
   Widget body(BuildContext context) =>
-      AdvancedPrivacySettingsBody(privacySettingsViewModel);
+      AdvancedPrivacySettingsBody(privacySettingsViewModel, nodeViewModel);
 }
 
 class AdvancedPrivacySettingsBody extends StatefulWidget {
-  const AdvancedPrivacySettingsBody(this.privacySettingsViewModel, {Key key})
+  const AdvancedPrivacySettingsBody(this.privacySettingsViewModel, this.nodeViewModel, {Key key})
       : super(key: key);
 
   final PrivacySettingsViewModel privacySettingsViewModel;
+  final NodeCreateOrEditViewModel nodeViewModel;
 
   @override
   _AdvancedPrivacySettingsBodyState createState() =>
-      _AdvancedPrivacySettingsBodyState(privacySettingsViewModel);
+      _AdvancedPrivacySettingsBodyState(privacySettingsViewModel, nodeViewModel);
 }
 
 class _AdvancedPrivacySettingsBodyState
     extends State<AdvancedPrivacySettingsBody> {
-  _AdvancedPrivacySettingsBodyState(this.privacySettingsViewModel);
+  _AdvancedPrivacySettingsBodyState(this.privacySettingsViewModel, this.nodeViewModel);
 
   final PrivacySettingsViewModel privacySettingsViewModel;
+  final NodeCreateOrEditViewModel nodeViewModel;
 
   final _formKey = GlobalKey<FormState>();
 
-  final TextEditingController _controller = TextEditingController();
-
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -67,75 +68,9 @@ class _AdvancedPrivacySettingsBodyState
                 if (privacySettingsViewModel.addCustomNode) {
                   return Padding(
                     padding: EdgeInsets.only(top: 24),
-                    child: Form(
-                      key: _formKey,
-                      child: TextFormField(
-                        onChanged: (value) {},
-                        controller: _controller,
-                        textAlign: TextAlign.center,
-                        style: TextStyle(
-                            fontSize: 20.0,
-                            fontWeight: FontWeight.w600,
-                            color:
-                                Theme.of(context).primaryTextTheme.title.color),
-                        decoration: InputDecoration(
-                          hintStyle: TextStyle(
-                              fontSize: 18.0,
-                              fontWeight: FontWeight.w500,
-                              color: Theme.of(context)
-                                  .accentTextTheme
-                                  .display3
-                                  .color),
-                          hintText: S.of(context).wallet_name,
-                          focusedBorder: UnderlineInputBorder(
-                            borderSide: BorderSide(
-                                color: Theme.of(context)
-                                    .accentTextTheme
-                                    .display3
-                                    .decorationColor,
-                                width: 1.0),
-                          ),
-                          enabledBorder: UnderlineInputBorder(
-                            borderSide: BorderSide(
-                                color: Theme.of(context)
-                                    .accentTextTheme
-                                    .display3
-                                    .decorationColor,
-                                width: 1.0),
-                          ),
-                          suffixIcon: IconButton(
-                            onPressed: () async {
-                              final rName = await generateName();
-                              FocusManager.instance.primaryFocus?.unfocus();
-
-                              setState(() {
-                                _controller.text = rName;
-                                _controller.selection =
-                                    TextSelection.fromPosition(
-                                  TextPosition(offset: _controller.text.length),
-                                );
-                              });
-                            },
-                            icon: Container(
-                              padding: const EdgeInsets.all(8),
-                              decoration: BoxDecoration(
-                                borderRadius: BorderRadius.circular(6.0),
-                                color: Theme.of(context).hintColor,
-                              ),
-                              width: 34,
-                              height: 34,
-                              child: Image.asset(
-                                'assets/images/refresh_icon.png',
-                                color: Theme.of(context)
-                                    .primaryTextTheme
-                                    .display1
-                                    .decorationColor,
-                              ),
-                            ),
-                          ),
-                        ),
-                        validator: WalletNameValidator(),
-                      ),
+                    child: NodeForm(
+                      formKey: _formKey,
+                      nodeViewModel: nodeViewModel,
                     ),
                   );
                 }
diff --git a/lib/src/screens/nodes/node_create_or_edit_page.dart b/lib/src/screens/nodes/node_create_or_edit_page.dart
index 857bde023..e4864cc91 100644
--- a/lib/src/screens/nodes/node_create_or_edit_page.dart
+++ b/lib/src/screens/nodes/node_create_or_edit_page.dart
@@ -1,16 +1,13 @@
 import 'package:cake_wallet/core/execution_state.dart';
+import 'package:cake_wallet/src/screens/nodes/widgets/node_form.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/src/widgets/standard_checkbox.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/core/node_address_validator.dart';
-import 'package:cake_wallet/core/node_port_validator.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
@@ -108,91 +105,10 @@ class NodeCreateOrEditPage extends BasePage {
         padding: EdgeInsets.only(left: 24, right: 24),
         child: ScrollableWithBottomSection(
           contentPadding: EdgeInsets.only(bottom: 24.0),
-          content: Form(
-              key: _formKey,
-              child: Column(
-                children: <Widget>[
-                  Row(
-                    children: <Widget>[
-                      Expanded(
-                        child: BaseTextFormField(
-                          controller: _addressController,
-                          hintText: S.of(context).node_address,
-                          validator: NodeAddressValidator(),
-                        )
-                      )
-                    ],
-                  ),
-                  SizedBox(height: 10.0),
-                  Row(
-                    children: <Widget>[
-                      Expanded(
-                        child: BaseTextFormField(
-                          controller: _portController,
-                          hintText: S.of(context).node_port,
-                          keyboardType: TextInputType.numberWithOptions(
-                              signed: false, decimal: false),
-                          validator: NodePortValidator(),
-                        )
-                      )
-                    ],
-                  ),
-                  SizedBox(height: 10.0),
-                  if (nodeCreateOrEditViewModel.hasAuthCredentials) ...[
-                    Row(
-                      children: <Widget>[
-                        Expanded(
-                          child: BaseTextFormField(
-                            controller: _loginController,
-                            hintText: S.of(context).login,
-                          )
-                        )
-                      ],
-                    ),
-                    SizedBox(height: 10.0),
-                    Row(
-                      children: <Widget>[
-                        Expanded(
-                          child: BaseTextFormField(
-                            controller: _passwordController,
-                            hintText: S.of(context).password,
-                          )
-                        )
-                      ],
-                    ),
-                    Padding(
-                      padding: EdgeInsets.only(top: 20),
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.start,
-                        mainAxisSize: MainAxisSize.max,
-                        children: [
-                          Observer(
-                              builder: (_) => StandardCheckbox(
-                                value: nodeCreateOrEditViewModel.useSSL,
-                                onChanged: (value) =>
-                                  nodeCreateOrEditViewModel.useSSL = value,
-                                caption: S.of(context).use_ssl,
-                              ))
-                        ],
-                      )),
-                    Padding(
-                      padding: EdgeInsets.only(top: 20),
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.start,
-                        mainAxisSize: MainAxisSize.max,
-                        children: [
-                          Observer(
-                              builder: (_) => StandardCheckbox(
-                                value: nodeCreateOrEditViewModel.trusted,
-                                onChanged: (value) =>
-                                  nodeCreateOrEditViewModel.trusted = value,
-                                caption: S.of(context).trusted,
-                              ))
-                        ],
-                      )),
-                  ]
-                ],
-              )),
+          content: NodeForm(
+            formKey: _formKey,
+            nodeViewModel: nodeCreateOrEditViewModel,
+          ),
           bottomSectionPadding: EdgeInsets.only(bottom: 24),
           bottomSection: Observer(
               builder: (_) => Row(
diff --git a/lib/src/screens/nodes/widgets/node_form.dart b/lib/src/screens/nodes/widgets/node_form.dart
new file mode 100644
index 000000000..757032a2a
--- /dev/null
+++ b/lib/src/screens/nodes/widgets/node_form.dart
@@ -0,0 +1,151 @@
+import 'package:cake_wallet/core/node_address_validator.dart';
+import 'package:cake_wallet/core/node_port_validator.dart';
+import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
+import 'package:cake_wallet/src/widgets/standard_checkbox.dart';
+import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:mobx/mobx.dart';
+
+class NodeForm extends StatelessWidget {
+  NodeForm({
+    @required this.nodeViewModel,
+    @required this.formKey,
+  })  : _addressController = TextEditingController(),
+        _portController = TextEditingController(),
+        _loginController = TextEditingController(),
+        _passwordController = TextEditingController() {
+    reaction((_) => nodeViewModel.address, (String address) {
+      if (address != _addressController.text) {
+        _addressController.text = address;
+      }
+    });
+
+    reaction((_) => nodeViewModel.port, (String port) {
+      if (port != _portController.text) {
+        _portController.text = port;
+      }
+    });
+
+    if (nodeViewModel.hasAuthCredentials) {
+      reaction((_) => nodeViewModel.login, (String login) {
+        if (login != _loginController.text) {
+          _loginController.text = login;
+        }
+      });
+
+      reaction((_) => nodeViewModel.password, (String password) {
+        if (password != _passwordController.text) {
+          _passwordController.text = password;
+        }
+      });
+    }
+
+    _addressController
+        .addListener(() => nodeViewModel.address = _addressController.text);
+    _portController
+        .addListener(() => nodeViewModel.port = _portController.text);
+    _loginController
+        .addListener(() => nodeViewModel.login = _loginController.text);
+    _passwordController
+        .addListener(() => nodeViewModel.password = _passwordController.text);
+  }
+
+  final NodeCreateOrEditViewModel nodeViewModel;
+  final GlobalKey<FormState> formKey;
+
+  final TextEditingController _addressController;
+  final TextEditingController _portController;
+  final TextEditingController _loginController;
+  final TextEditingController _passwordController;
+
+  @override
+  Widget build(BuildContext context) {
+    return Form(
+      key: formKey,
+      child: Column(
+        children: <Widget>[
+          Row(
+            children: <Widget>[
+              Expanded(
+                child: BaseTextFormField(
+                  controller: _addressController,
+                  hintText: S.of(context).node_address,
+                  validator: NodeAddressValidator(),
+                ),
+              )
+            ],
+          ),
+          SizedBox(height: 10.0),
+          Row(
+            children: <Widget>[
+              Expanded(
+                  child: BaseTextFormField(
+                controller: _portController,
+                hintText: S.of(context).node_port,
+                keyboardType: TextInputType.numberWithOptions(
+                    signed: false, decimal: false),
+                validator: NodePortValidator(),
+              ))
+            ],
+          ),
+          SizedBox(height: 10.0),
+          if (nodeViewModel.hasAuthCredentials) ...[
+            Row(
+              children: <Widget>[
+                Expanded(
+                    child: BaseTextFormField(
+                  controller: _loginController,
+                  hintText: S.of(context).login,
+                ))
+              ],
+            ),
+            SizedBox(height: 10.0),
+            Row(
+              children: <Widget>[
+                Expanded(
+                    child: BaseTextFormField(
+                  controller: _passwordController,
+                  hintText: S.of(context).password,
+                ))
+              ],
+            ),
+            Padding(
+              padding: EdgeInsets.only(top: 20),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.start,
+                mainAxisSize: MainAxisSize.max,
+                children: [
+                  Observer(
+                    builder: (_) => StandardCheckbox(
+                      value: nodeViewModel.useSSL,
+                      onChanged: (value) => nodeViewModel.useSSL = value,
+                      caption: S.of(context).use_ssl,
+                    ),
+                  )
+                ],
+              ),
+            ),
+            Padding(
+              padding: EdgeInsets.only(top: 20),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.start,
+                mainAxisSize: MainAxisSize.max,
+                children: [
+                  Observer(
+                    builder: (_) => StandardCheckbox(
+                      value: nodeViewModel.trusted,
+                      onChanged: (value) => nodeViewModel.trusted = value,
+                      caption: S.of(context).trusted,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ]
+        ],
+      ),
+    );
+  }
+}
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 c14bdda5e..be6e3e316 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,7 +1,6 @@
 import 'package:cake_wallet/core/execution_state.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
-import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/node.dart';
 import 'package:cw_core/wallet_type.dart';
 
@@ -11,7 +10,7 @@ class NodeCreateOrEditViewModel = NodeCreateOrEditViewModelBase
     with _$NodeCreateOrEditViewModel;
 
 abstract class NodeCreateOrEditViewModelBase with Store {
-  NodeCreateOrEditViewModelBase(this._nodeSource, this._wallet)
+  NodeCreateOrEditViewModelBase(this._nodeSource, this._walletType)
       : state = InitialExecutionState(),
         connectionState = InitialExecutionState(),
         useSSL = false,
@@ -45,8 +44,8 @@ abstract class NodeCreateOrEditViewModelBase with Store {
   bool get isReady =>
       (address?.isNotEmpty ?? false) && (port?.isNotEmpty ?? false);
 
-  bool get hasAuthCredentials => _wallet.type == WalletType.monero ||
-    _wallet.type == WalletType.haven;
+  bool get hasAuthCredentials => _walletType == WalletType.monero ||
+    _walletType == WalletType.haven;
 
   String get uri {
     var uri = address;
@@ -58,7 +57,7 @@ abstract class NodeCreateOrEditViewModelBase with Store {
     return uri;
   }
 
-  final WalletBase _wallet;
+  final WalletType _walletType;
   final Box<Node> _nodeSource;
 
   @action
@@ -76,7 +75,7 @@ abstract class NodeCreateOrEditViewModelBase with Store {
     try {
       state = IsExecutingState();
       final node =
-          Node(uri: uri, type: _wallet.type, login: login, password: password,
+          Node(uri: uri, type: _walletType, login: login, password: password,
               useSSL: useSSL, trusted: trusted);
       await _nodeSource.add(node);
       state = ExecutedSuccessfullyState();
@@ -90,7 +89,7 @@ abstract class NodeCreateOrEditViewModelBase with Store {
     try {
       connectionState = IsExecutingState();
       final node =
-        Node(uri: uri, type: _wallet.type, login: login, password: password);
+        Node(uri: uri, type: _walletType, login: login, password: password);
       final isAlive = await node.requestNode();
       connectionState = ExecutedSuccessfullyState(payload: isAlive);
     } catch (e) {