diff --git a/lib/features/create_diet/presentation/cubit/create_diet_cubit.dart b/lib/features/create_diet/presentation/cubit/create_diet_cubit.dart
index 242db660..7d50d11c 100644
--- a/lib/features/create_diet/presentation/cubit/create_diet_cubit.dart
+++ b/lib/features/create_diet/presentation/cubit/create_diet_cubit.dart
@@ -302,7 +302,10 @@ class CreateDietCubit extends Cubit<CreateDietState> {
 
   Future<String?> createDiet() async {
     emit(state.copyWith(isDietPublishing: true));
-    if (!_isFromValid()) return 'validation';
+    if (!_isFromValid()) {
+      emit(state.copyWith(isDietPublishing: false));
+      return 'validation';
+    }
     try {
       File? file;
       if (state.dietData.imageUrl != null) {
diff --git a/lib/features/registration_v2/cubit/registration_cubit.dart b/lib/features/registration_v2/cubit/registration_cubit.dart
index 0a55ecff..67cd5a0d 100644
--- a/lib/features/registration_v2/cubit/registration_cubit.dart
+++ b/lib/features/registration_v2/cubit/registration_cubit.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dar
 import 'package:eatvio_app/features/registration_v2/models/registration_model.dart';
 import 'package:eatvio_app/features/registration_v2/repositories/registration_repository_v2.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_password_generator/flutter_password_generator.dart';
+import 'package:gpassword/gpassword.dart';
 
 class RegistrationCubitV2 extends Cubit<RegistrationStateV2> {
   final RegistrationRepositoryV2 registrationRepository;
@@ -230,9 +230,8 @@ class RegistrationCubitV2 extends Cubit<RegistrationStateV2> {
   }
 
   Future<String> _generatePassword() async {
-    final generator = FlutterPasswordGenerator(length: 8);
-    final result = await generator.generatePassword();
-    final password = result['password'] as String;
+    final generator = GPassword();
+    final password = generator.generate(passwordLength: 10);
     emit(state.copyWith(password: password));
     return password;
   }
diff --git a/lib/features/registration_v2/presentation/widgets/password_field.dart b/lib/features/registration_v2/presentation/widgets/password_field.dart
index 859f9b67..b4fea946 100644
--- a/lib/features/registration_v2/presentation/widgets/password_field.dart
+++ b/lib/features/registration_v2/presentation/widgets/password_field.dart
@@ -42,6 +42,7 @@ class _PasswordFieldState extends State<PasswordField> {
                               copied = true;
                             });
                             Future.delayed(const Duration(seconds: 3), () {
+                              if (!context.mounted) return;
                               setState(() {
                                 copied = false;
                               });
diff --git a/pubspec.yaml b/pubspec.yaml
index 8d81057a..5e3c7d25 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -77,7 +77,7 @@ dependencies:
   vk_id: ^1.0.3
   flutter_login_yandex: ^0.0.5
   markdown: ^7.3.0
-  flutter_password_generator: ^1.0.3
+  gpassword: ^1.0.0
 
 dev_dependencies:
   build_runner: ^2.7.0