diff --git a/mobile-app/lib/v2/screens/accounts/create_account_screen.dart b/mobile-app/lib/v2/screens/accounts/create_account_screen.dart
index 84a0f43d..8175aea6 100644
--- a/mobile-app/lib/v2/screens/accounts/create_account_screen.dart
+++ b/mobile-app/lib/v2/screens/accounts/create_account_screen.dart
@@ -29,9 +29,8 @@ class _CreateAccountScreenState extends ConsumerState<CreateAccountScreen> {
   List<Account> _accounts = [];
   int _walletIndex = 0;
   bool _isLoading = false;
-  String? _error;
 
-  bool get _isDisabled => _accountName.text.isEmpty || _isLoading || _error != null;
+  bool get _isDisabled => _accountName.text.trim().isEmpty || _isLoading;
 
   int _walletIndexForActiveAccount(List<Account> accounts, DisplayAccount? activeDisplayAccount) {
     if (activeDisplayAccount is RegularAccount) {
@@ -126,7 +125,7 @@ class _CreateAccountScreenState extends ConsumerState<CreateAccountScreen> {
 
     return ScaffoldBase(
       appBar: V2AppBar(title: l10n.createAccountAppBarTitle),
-      mainContent: NameField(controller: _accountName, subtitle: l10n.createAccountSubtitle, error: _error),
+      mainContent: NameField(controller: _accountName, subtitle: l10n.createAccountSubtitle),
       bottomContent: ScaffoldBaseBottomContent(
         child: QuantusButton.simple(
           label: l10n.createAccountButton,
diff --git a/mobile-app/lib/v2/screens/accounts/edit_account_screen.dart b/mobile-app/lib/v2/screens/accounts/edit_account_screen.dart
index 6bb7ea76..c891c49f 100644
--- a/mobile-app/lib/v2/screens/accounts/edit_account_screen.dart
+++ b/mobile-app/lib/v2/screens/accounts/edit_account_screen.dart
@@ -24,6 +24,8 @@ class EditAccountScreenState extends ConsumerState<EditAccountScreen> {
   final _accountsService = AccountsService();
   bool _saving = false;
 
+  bool get _isDisabled => _controller.text.trim().isEmpty;
+
   @override
   void initState() {
     super.initState();
@@ -82,6 +84,7 @@ class EditAccountScreenState extends ConsumerState<EditAccountScreen> {
           label: l10n.editAccountDone,
           onTap: _save,
           isLoading: _saving,
+          isDisabled: _isDisabled,
         ),
       ),
     );
diff --git a/mobile-app/lib/v2/screens/settings/mining_rewards_screen.dart b/mobile-app/lib/v2/screens/settings/mining_rewards_screen.dart
index 2e103720..de3c4b85 100644
--- a/mobile-app/lib/v2/screens/settings/mining_rewards_screen.dart
+++ b/mobile-app/lib/v2/screens/settings/mining_rewards_screen.dart
@@ -8,9 +8,7 @@ import 'package:resonance_network_wallet/providers/mining_rewards_provider.dart'
 import 'package:resonance_network_wallet/providers/wallet_providers.dart';
 import 'package:resonance_network_wallet/services/mining_rewards_service.dart';
 import 'package:resonance_network_wallet/shared/utils/open_external_url.dart';
-import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
 import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
-import 'package:resonance_network_wallet/v2/components/scaffold_base_bottom_content.dart';
 import 'package:resonance_network_wallet/v2/components/split_card.dart';
 import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
@@ -37,13 +35,14 @@ class MiningRewardsScreen extends ConsumerWidget {
               _ErrorState(colors: colors, text: text, l10n: l10n, onRetry: () => ref.invalidate(miningRewardsProvider)),
         ),
       ],
-      bottomContent: miningAsync.when(
-        data: (data) => data.totalBlocks > 0
-            ? ScaffoldBaseBottomContent(child: QuantusButton.simple(label: l10n.settingsMiningRedeem, onTap: null))
-            : null,
-        loading: () => null,
-        error: (err, _) => null,
-      ),
+      // TODO: Enable redeem button when it is implemented
+      // bottomContent: miningAsync.when(
+      //   data: (data) => data.totalBlocks > 0
+      //       ? ScaffoldBaseBottomContent(child: QuantusButton.simple(label: l10n.settingsMiningRedeem, onTap: null))
+      //       : null,
+      //   loading: () => null,
+      //   error: (err, _) => null,
+      // ),
     );
   }
 }