diff --git a/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs b/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs
index b900cb9c..ce045829 100644
--- a/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs
+++ b/BMA.EHR.Application/Repositories/MessageQueue/NotificationRepository.cs
@@ -59,58 +59,58 @@ namespace BMA.EHR.Application.Repositories.MessageQueue
             try
             {
                 var profile = await _dbContext.Set<Profile>().FirstOrDefaultAsync(x => x.Id == ReceiverUserId);
-                if (profile == null)
-                    throw new Exception(GlobalMessages.DataNotFound);
-
-                if (IsSendNotification == true)
+                if (profile != null)
                 {
-                    _dbContext.Set<Notification>().Add(new Notification
+                    if (IsSendNotification == true)
                     {
-                        Body = Body,
-                        ReceiverUserId = ReceiverUserId,
-                        Type = "",
-                        Payload = "",
-                        CreatedUserId = FullName ?? "",
-                        CreatedFullName = UserId ?? "System Administrator",
-                        CreatedAt = DateTime.Now,
-                        LastUpdateFullName = FullName ?? "System Administrator",
-                        LastUpdateUserId = UserId ?? "",
-                        LastUpdatedAt = DateTime.Now,
-                    });
-                }
-                if (IsSendInbox == true)
-                {
-                    _dbContext.Set<Inbox>().Add(new Inbox
+                        _dbContext.Set<Notification>().Add(new Notification
+                        {
+                            Body = Body,
+                            ReceiverUserId = ReceiverUserId,
+                            Type = "",
+                            Payload = "",
+                            CreatedUserId = FullName ?? "",
+                            CreatedFullName = UserId ?? "System Administrator",
+                            CreatedAt = DateTime.Now,
+                            LastUpdateFullName = FullName ?? "System Administrator",
+                            LastUpdateUserId = UserId ?? "",
+                            LastUpdatedAt = DateTime.Now,
+                        });
+                    }
+                    if (IsSendInbox == true)
                     {
-                        Subject = Subject,
-                        Body = Body,
-                        ReceiverUserId = ReceiverUserId,
-                        Payload = "",
-                        CreatedUserId = FullName ?? "",
-                        CreatedFullName = UserId ?? "System Administrator",
-                        CreatedAt = DateTime.Now,
-                        LastUpdateFullName = FullName ?? "System Administrator",
-                        LastUpdateUserId = UserId ?? "",
-                        LastUpdatedAt = DateTime.Now,
-                    });
+                        _dbContext.Set<Inbox>().Add(new Inbox
+                        {
+                            Subject = Subject,
+                            Body = Body,
+                            ReceiverUserId = ReceiverUserId,
+                            Payload = "",
+                            CreatedUserId = FullName ?? "",
+                            CreatedFullName = UserId ?? "System Administrator",
+                            CreatedAt = DateTime.Now,
+                            LastUpdateFullName = FullName ?? "System Administrator",
+                            LastUpdateUserId = UserId ?? "",
+                            LastUpdatedAt = DateTime.Now,
+                        });
+                    }
+                    if (IsSendMail == true)
+                    {
+                        // _context.Notifications.Add(new Notification
+                        // {
+                        //     Body = req.Body,
+                        //     ReceiverUserId = req.ReceiverUserId,
+                        //     Type = "",
+                        //     Payload = "",
+                        //     CreatedUserId = FullName ?? "",
+                        //     CreatedFullName = UserId ?? "System Administrator",
+                        //     CreatedAt = DateTime.Now,
+                        //     LastUpdateFullName = FullName ?? "System Administrator",
+                        //     LastUpdateUserId = UserId ?? "",
+                        //     LastUpdatedAt = DateTime.Now,
+                        // });
+                    }
+                    await _dbContext.SaveChangesAsync();
                 }
-                if (IsSendMail == true)
-                {
-                    // _context.Notifications.Add(new Notification
-                    // {
-                    //     Body = req.Body,
-                    //     ReceiverUserId = req.ReceiverUserId,
-                    //     Type = "",
-                    //     Payload = "",
-                    //     CreatedUserId = FullName ?? "",
-                    //     CreatedFullName = UserId ?? "System Administrator",
-                    //     CreatedAt = DateTime.Now,
-                    //     LastUpdateFullName = FullName ?? "System Administrator",
-                    //     LastUpdateUserId = UserId ?? "",
-                    //     LastUpdatedAt = DateTime.Now,
-                    // });
-                }
-                await _dbContext.SaveChangesAsync();
             }
             catch
             {
diff --git a/BMA.EHR.Retirement.Service/appsettings.json b/BMA.EHR.Retirement.Service/appsettings.json
index c694a90c..7da4ee84 100644
--- a/BMA.EHR.Retirement.Service/appsettings.json
+++ b/BMA.EHR.Retirement.Service/appsettings.json
@@ -19,7 +19,7 @@
     },
     "Jwt": {
         "Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
-        "Issuer": "https://identity.frappet.com/realms/bma-ehr"
+        "Issuer": "https://id.frappet.synology.me/realms/bma-ehr"
     },
     "EPPlus": {
         "ExcelPackage": {
diff --git a/BMA.EHR.Retirement.Service/wwwroot/keycloak.json b/BMA.EHR.Retirement.Service/wwwroot/keycloak.json
index 9eba3b39..a023eb38 100644
--- a/BMA.EHR.Retirement.Service/wwwroot/keycloak.json
+++ b/BMA.EHR.Retirement.Service/wwwroot/keycloak.json
@@ -1,6 +1,6 @@
 {
   "realm": "bma-ehr",
-  "auth-server-url": "https://identity.frappet.com",
+  "auth-server-url": "https://id.frappet.synology.me",
   "ssl-required": "external",
   "resource": "bma-ehr",
   "public-client": true