diff --git a/lib/pages/login/register-info.dart b/lib/pages/login/register-info.dart
index d28fea86..e1152032 100644
--- a/lib/pages/login/register-info.dart
+++ b/lib/pages/login/register-info.dart
@@ -2,8 +2,9 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
 import 'package:diplomaticquarterapp/config/size_config.dart';
 import 'package:diplomaticquarterapp/models/Authentication/check_paitent_authentication_req.dart';
 import 'package:diplomaticquarterapp/models/Authentication/register_info_response.dart';
-import 'package:diplomaticquarterapp/models/Authentication/register_user_requet.dart';
-import 'package:diplomaticquarterapp/pages/login/login-type.dart';
+import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
+import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart'
+    as checkActivation;
 import 'package:diplomaticquarterapp/routes.dart';
 import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
@@ -20,6 +21,10 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:hijri/hijri_calendar.dart';
 import 'package:intl/intl.dart';
+import 'package:diplomaticquarterapp/locator.dart';
+import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
+import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart';
+import 'package:provider/provider.dart';
 
 class RegisterInfo extends StatefulWidget {
   @override
@@ -45,6 +50,13 @@ class _RegisterInfo extends State<RegisterInfo> {
   String email = '';
 
   String location = '1';
+  AuthenticatedUserObject authenticatedUserObject =
+      locator<AuthenticatedUserObject>();
+
+  ProjectViewModel projectViewModel;
+
+  AppointmentRateViewModel appointmentRateViewModel =
+      locator<AppointmentRateViewModel>();
 
   @override
   void initState() {
@@ -56,6 +68,8 @@ class _RegisterInfo extends State<RegisterInfo> {
 
   @override
   Widget build(BuildContext context) {
+    projectViewModel = Provider.of(context);
+
     return AppScaffold(
         appBarTitle: TranslationBase.of(context).register,
         isShowAppBar: true,
@@ -300,16 +314,17 @@ class _RegisterInfo extends State<RegisterInfo> {
                 }
               else
                 {
+                  result = checkActivation.CheckActivationCode.fromJson(result),
                   result.list.isFamily = false,
                   sharedPref.setObject(USER_PROFILE, result.list),
                   this.sharedPref.setObject(MAIN_USER, result.list),
                   sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID),
                   sharedPref.setString(TOKEN, result.authenticationTokenID),
-                  Navigator.of(context).pushNamed(HOME)
+                  this.setUser(result),
                 }
             })
         .catchError((err) {
-      GifLoaderDialogUtils.hideDialog(context);
+      // GifLoaderDialogUtils.hideDialog(context);
       ConfirmDialog dialog = new ConfirmDialog(
           context: context,
           confirmMessage: err,
@@ -321,6 +336,15 @@ class _RegisterInfo extends State<RegisterInfo> {
     });
   }
 
+  setUser(result) async {
+    await authenticatedUserObject.getUser(getUser: true);
+    authenticatedUserObject.isLogin = true;
+    appointmentRateViewModel.isLogin = true;
+    projectViewModel.isLogin = true;
+    authenticatedUserObject.user = result.list;
+    Navigator.of(context).pushNamed(HOME);
+  }
+
   getRegisterInfo() async {
     var data =
         RegisterInfoResponse.fromJson(await sharedPref.getObject(NHIC_DATA));
diff --git a/lib/services/authentication/auth_provider.dart b/lib/services/authentication/auth_provider.dart
index 926ee2bc..dcc5599b 100644
--- a/lib/services/authentication/auth_provider.dart
+++ b/lib/services/authentication/auth_provider.dart
@@ -328,6 +328,7 @@ class AuthProvider with ChangeNotifier {
     request['LanguageID'] = LANGUAGE_ID;
     var requestN = RegisterUserRequest.fromJson(request);
     requestN.patientOutSA = requestN.patientobject.patientOutSA;
+    await sharedPref.remove(USER_PROFILE);
     // request.tokenID = '';
     dynamic localRes;
     try {