diff --git a/lib/features/auth/registration/view/submission_data/submit_data_id_card.dart b/lib/features/auth/registration/view/submission_data/submit_data_id_card.dart
index 0ff833f..24c096b 100644
--- a/lib/features/auth/registration/view/submission_data/submit_data_id_card.dart
+++ b/lib/features/auth/registration/view/submission_data/submit_data_id_card.dart
@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:cims_apps/application/assets/path_assets.dart';
 import 'package:cims_apps/application/component/button/button_view.dart';
+import 'package:cims_apps/application/component/date_picker/date_picker_view.dart';
 import 'package:cims_apps/application/component/image/image_view.dart';
 import 'package:cims_apps/application/component/text_caption/text_caption.dart';
 import 'package:cims_apps/application/component/text_form/text_form_view.dart';
@@ -174,13 +175,11 @@ class SubmitDataIdCard extends StatelessWidget {
                       title: 'Check your ID card data for accuracy'),
                   TextFormView(name: 'NIK'),
                   TextFormView(name: 'Full Name'),
-                  TextFormView(
-                    name: 'Birth Date',
-                    suffixIcon: const Icon(
-                      Icons.calendar_today_rounded,
-                      color: ColorPalette.slate400,
-                    ),
-                  ),
+                  DatePickerView(
+                      name: 'Birth Date',
+                      ctrl: provider.ctrlBirthDate,
+                      isMultipleSelection: false,
+                      enabled: true),
                   photoDocument(provider),
                   Container(
                     width: SizeConfig.width,
diff --git a/lib/features/auth/registration/view/submission_data/submit_email.dart b/lib/features/auth/registration/view/submission_data/submit_email.dart
index f980bc5..bf367fe 100644
--- a/lib/features/auth/registration/view/submission_data/submit_email.dart
+++ b/lib/features/auth/registration/view/submission_data/submit_email.dart
@@ -5,6 +5,7 @@ import 'package:cims_apps/application/component/text_caption/text_caption.dart';
 import 'package:cims_apps/application/component/text_form/text_form_view.dart';
 import 'package:cims_apps/core/route/route.dart';
 import 'package:cims_apps/core/utils/size_config.dart';
+import 'package:cims_apps/core/utils/string_utils.dart';
 import 'package:cims_apps/features/auth/registration/view/submission_data/submission_parent.dart';
 import 'package:cims_apps/features/auth/registration/viewmodel/submission_data_viewmodel.dart';
 import 'package:flutter/gestures.dart';
@@ -32,10 +33,7 @@ class SubmitEmail extends StatelessWidget {
                 ),
               ),
               TextSpan(
-                recognizer: TapGestureRecognizer()
-                  ..onTap = () {
-                    print('object');
-                  },
+                recognizer: TapGestureRecognizer()..onTap = () {},
                 text: 'verification',
                 style: const TextStyle(
                   color: Colors.blue,
@@ -74,6 +72,16 @@ class SubmitEmail extends StatelessWidget {
                       ? TextFormView(
                           name: 'E-mail Address',
                           hintText: 'Input e-mail address',
+                          keyboardType: TextInputType.emailAddress,
+                          validator: (value) {
+                            if (value!.isEmpty) {
+                              return 'Filled cannot be empty';
+                            } else if (!StringUtils.emailValidation(value)) {
+                              return 'Format email wrong';
+                            } else {
+                              return null;
+                            }
+                          },
                           // onTap: () {
                           //   provider.submitEmail();
                           // },
diff --git a/lib/features/auth/registration/viewmodel/submission_data_viewmodel.dart b/lib/features/auth/registration/viewmodel/submission_data_viewmodel.dart
index 04b9f52..16eaeaa 100644
--- a/lib/features/auth/registration/viewmodel/submission_data_viewmodel.dart
+++ b/lib/features/auth/registration/viewmodel/submission_data_viewmodel.dart
@@ -19,6 +19,7 @@ class SubmissionDataViewModel extends ChangeNotifier {
   TextEditingController ctrlMarital = TextEditingController();
   TextEditingController ctrlSourceFund = TextEditingController();
   TextEditingController ctrlBankName = TextEditingController();
+  TextEditingController ctrlBirthDate = TextEditingController();
   int step = 1;
 
   List<ItemSelectForm> listOccupation = [