diff --git a/IRMARADASHBOARD/global.R b/IRMARADASHBOARD/global.R
index 79bf46ddbf7e16947e01d975832a9cef5758ee11..6679af3b52a39e630d74c27b887ebc5b2f6c85fa 100644
--- a/IRMARADASHBOARD/global.R
+++ b/IRMARADASHBOARD/global.R
@@ -81,8 +81,8 @@ allThresholds <- rbind(
 
 
 Logged = FALSE;
-my_username <- "1"
-my_password <- "1"
+my_username <- readRDS("www/usePass.Rds")[1]
+my_password <- readRDS("www/usePass.Rds")[2]
 
 ################################################################################
 ########################FUNCTIONS FOR UI and SERVER ############################
diff --git a/IRMARADASHBOARD/server.R b/IRMARADASHBOARD/server.R
index 2387c95bb6812eb653f7c8ee6448eaef906400e7..b1fa0fcfd04255546e76ed310ad1b100f213ac63 100644
--- a/IRMARADASHBOARD/server.R
+++ b/IRMARADASHBOARD/server.R
@@ -780,10 +780,16 @@ function(input, output, session) {
     }
   })
 
-  observe({
+  observeEvent(input$Login,{
     if (USER$Logged == TRUE) {
       updateTabItems(session, "tabs",  selected =  "adminstration")
-    }
+    } else
+      sendSweetAlert(
+        session = session,
+        title = "Error...",
+        text = "The Username or Password is incorrect!",
+        type = "error"
+      )
   })
   ###################ADMINISTRATION AREA ########################################
 
@@ -843,6 +849,30 @@ function(input, output, session) {
                                 title = "Saved !!",
                                 type = "success")
                })
+  #Account Page
+  observeEvent(input$saveAccount,
+               {
+                 if (input$oldPasswd == readRDS("www/usePass.Rds")[2]) {
+                   usenamePassword <-  c(input$newUsername, input$newPasswd)
+                   saveRDS(usenamePassword, "www/usePass.Rds")
+                   sendSweetAlert(session = session,
+                                  title = "Saved !!",
+                                  type = "success")
+                 } else if (input$newPasswd == readRDS("www/usePass.Rds")[2]) {
+                   sendSweetAlert(
+                     session = session,
+                     title = "Error...",
+                     text = "New password should be different with old password!",
+                     type = "error"
+                   )
+                 } else
+                   sendSweetAlert(
+                     session = session,
+                     title = "Error...",
+                     text = "Old password does not match!",
+                     type = "error"
+                   )
 
+               })
 
 } # Input-Output Function
diff --git a/IRMARADASHBOARD/ui.R b/IRMARADASHBOARD/ui.R
index 42d53a6105813746251c5a6cc6558050cb6bfea4..305a4e41f9117d6d3cb8584b10a2bc169d7130d9 100644
--- a/IRMARADASHBOARD/ui.R
+++ b/IRMARADASHBOARD/ui.R
@@ -976,8 +976,18 @@ dashboardPage(
                      ), # Tab Tool
                      tabPanel("MapPage", h3("Modifying the MapPage"),icon= icon("map-marked-alt")
 
-                     )
+                     ),
+
+                    tabPanel("Account", h3("Your Account"),icon= icon("id-card"),
+                             icon("user-alt", "fa-4x"), align = "center",
+                             div(h4(icon("id-badge", "fa 2x"), "Change your login account")),
+                             div(textInput("newUsername","New Username:")),
+                             div(passwordInput("oldPasswd","Old Password:")),
+                             div(passwordInput("newPasswd","New Password:")),
 
+                             actionButton("saveAccount", "SAVE", icon("save")
+                             )
+                    )
 
 
                    )
@@ -997,3 +1007,4 @@ dashboardPage(
 
   )
 )
+
diff --git a/IRMARADASHBOARD/www/usePass.Rds b/IRMARADASHBOARD/www/usePass.Rds
new file mode 100644
index 0000000000000000000000000000000000000000..31a50dc2e50230932126b74fd7bd2dcf5fc14d03
Binary files /dev/null and b/IRMARADASHBOARD/www/usePass.Rds differ