diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart
index c82518aa..a5ab8941 100644
--- a/lib/app/view/app.dart
+++ b/lib/app/view/app.dart
@@ -11,7 +11,6 @@ import 'package:coaching/remote_configs.dart';
 import 'package:coaching/start_page.dart';
 import 'package:coaching/test_results/view/coaching_test_results_page.dart';
 import 'package:coaching/test_results/view/congratulations_page.dart';
-import 'package:coaching/welcome/models/user_date_model.dart';
 import 'package:coaching/welcome/view/welcome_page.dart';
 import 'package:data_persistence_repository/data_persistence_repository.dart';
 import 'package:firestore_repository/firestore_repository.dart';
@@ -128,10 +127,7 @@ class _AppViewState extends State<AppView> {
           path: '/welcome',
           name: WelcomePage.name,
           builder: (_, state) {
-            final userModel = state.extra as UserDataModel?;
-            return WelcomePage(
-              userDataModel: userModel!,
-            );
+            return const WelcomePage();
           },
         ),
         GoRoute(
diff --git a/lib/welcome/cubit/welcome_cubit.dart b/lib/welcome/cubit/welcome_cubit.dart
index 6c2caa22..94b8252d 100644
--- a/lib/welcome/cubit/welcome_cubit.dart
+++ b/lib/welcome/cubit/welcome_cubit.dart
@@ -9,15 +9,12 @@ class WelcomeCubit extends Cubit<WelcomeState> {
   WelcomeCubit({
     required FirestoreRepository firestoreRepository,
     required DataPersistenceRepository dataPersistenceRepository,
-    required UserDataModel userDataModel,
   })  : _firestoreRepository = firestoreRepository,
         _dataPersistenceRepository = dataPersistenceRepository,
-        _userDataModel = userDataModel,
         super(WelcomeInitial());
 
   final FirestoreRepository _firestoreRepository;
   final DataPersistenceRepository _dataPersistenceRepository;
-  final UserDataModel _userDataModel;
 
   Future<void> submitUser({
     required String name,
@@ -28,7 +25,8 @@ class WelcomeCubit extends Cubit<WelcomeState> {
   }) async {
     emit(WelcomeLoading());
     try {
-      final completedUser = _userDataModel.completeUser(
+      final user = UserDataModel.fromMap(_firestoreRepository.user!);
+      final completedUser = user.completeUser(
         name: name,
         nationality: nationality,
         residence: residence,
diff --git a/lib/welcome/view/welcome_page.dart b/lib/welcome/view/welcome_page.dart
index bfe3632d..a3783e91 100644
--- a/lib/welcome/view/welcome_page.dart
+++ b/lib/welcome/view/welcome_page.dart
@@ -2,7 +2,6 @@ import 'package:coaching/app/widgets/coaching_app_bar.dart';
 import 'package:coaching/app/widgets/coaching_drawer.dart';
 import 'package:coaching/l10n/l10n.dart';
 import 'package:coaching/welcome/cubit/welcome_cubit.dart';
-import 'package:coaching/welcome/models/user_date_model.dart';
 import 'package:coaching/welcome/widgets/welcome_form_widget.dart';
 import 'package:data_persistence_repository/data_persistence_repository.dart';
 import 'package:firestore_repository/firestore_repository.dart';
@@ -11,13 +10,9 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:responsive_builder/responsive_builder.dart';
 
 class WelcomePage extends StatelessWidget {
-  const WelcomePage({
-    super.key,
-    required this.userDataModel,
-  });
+  const WelcomePage({super.key});
 
   static const name = 'Welcome Page';
-  final UserDataModel userDataModel;
 
   @override
   Widget build(BuildContext context) {
@@ -25,7 +20,6 @@ class WelcomePage extends StatelessWidget {
       create: (context) => WelcomeCubit(
         firestoreRepository: context.read<FirestoreRepository>(),
         dataPersistenceRepository: context.read<DataPersistenceRepository>(),
-        userDataModel: userDataModel,
       ),
       child: ResponsiveBuilder(
         builder: (context, sizingInformation) {