diff --git a/lib/features/authentication/authentication_repo.dart b/lib/features/authentication/authentication_repo.dart
index 291e4a9b..1c95d99a 100644
--- a/lib/features/authentication/authentication_repo.dart
+++ b/lib/features/authentication/authentication_repo.dart
@@ -222,6 +222,8 @@ class AuthenticationRepoImp implements AuthenticationRepo {
     if (isRegister) {
       newRequest["activationCode"] = activationCode ?? "0000";
       newRequest["isSilentLogin"] = activationCode == null;
+      newRequest.remove("NotificationCenterAppGUID");
+      newRequest.remove("NotificationCenterAppSeviceGUID");
     } else {
       newRequest.activationCode = activationCode ?? "0000";
       newRequest.isSilentLogin = activationCode == null;
diff --git a/lib/features/authentication/authentication_view_model.dart b/lib/features/authentication/authentication_view_model.dart
index 271c628d..57f76b66 100644
--- a/lib/features/authentication/authentication_view_model.dart
+++ b/lib/features/authentication/authentication_view_model.dart
@@ -1517,7 +1517,9 @@ class AuthenticationViewModel extends ChangeNotifier {
         LoaderBottomSheet.hideLoader();
         if (apiResponse.data["MessageStatus"] == 1) {
           LoaderBottomSheet.showLoader(loadingText: "Your medical file has been created successfully. \nPlease proceed to login.");
-          //TODO: Here We Need to Show a Dialog Of Something in the case of Success.
+          // Reset registration payload and clear healthId so subsequent logins hit the login endpoint
+          _appState.getUserRegistrationPayload.healthId = null;
+          _appState.setUserRegistrationPayload = RegistrationDataModelPayload();
           await clearDefaultInputValues(); // This will Clear All Default Values Of User.
           Future.delayed(Duration(seconds: 1), () {
             LoaderBottomSheet.hideLoader();