diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.InputUserPassword.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.InputUserPassword.cs
index 430365a7..d8123c2e 100644
--- a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.InputUserPassword.cs
+++ b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.InputUserPassword.cs
@@ -17,15 +17,14 @@ public partial class PlaywrightWebDriver
 
         if (password == null)
         {
-            throw new Exception($"Can't locate the web element {actionParams.Context.ElementName}.");
+            _logger.LogError($"Can't locate the password element by '{actionParams.Context.ElementName}'");
+            return false;
         }
 
         var config = _services.GetRequiredService<IConfiguration>();
         try
         {
-            var key = actionParams.Context.Password.Replace("@", "").Replace(".", ":");
-            var value = config.GetValue<string>(key);
-            await password.FillAsync(value);
+            await password.FillAsync(actionParams.Context.Password);
             return true;
         }
         catch (Exception ex)
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.Screenshot.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.Screenshot.cs
index aa096b75..b3a58d50 100644
--- a/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.Screenshot.cs
+++ b/src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.Screenshot.cs
@@ -9,6 +9,7 @@ public partial class PlaywrightWebDriver
             .ScreenshotAsync(new PageScreenshotOptions
             {
                 Path = path,
+                Animations = ScreenshotAnimations.Disabled
             });
 
         return "data:image/png;base64," + Convert.ToBase64String(bytes);
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Functions/InputUserPasswordFn.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Functions/InputUserPasswordFn.cs
index 30afded4..b378e0d0 100644
--- a/src/Plugins/BotSharp.Plugin.WebDriver/Functions/InputUserPasswordFn.cs
+++ b/src/Plugins/BotSharp.Plugin.WebDriver/Functions/InputUserPasswordFn.cs
@@ -21,11 +21,13 @@ public class InputUserPasswordFn : IFunctionCallback
 
         var agentService = _services.GetRequiredService<IAgentService>();
         var agent = await agentService.LoadAgent(message.CurrentAgentId);
+
+        var webDriverService = _services.GetRequiredService<WebDriverService>();
+        args.Password = webDriverService.ReplaceToken(args.Password);
         var result = await _browser.InputUserPassword(new BrowserActionParams(agent, args, convService.ConversationId, message.MessageId));
 
         message.Content = result ? "Input password successfully" : "Input password failed";
 
-        var webDriverService = _services.GetRequiredService<WebDriverService>();
         var path = webDriverService.GetScreenshotFilePath(message.MessageId);
 
         message.Data = await _browser.ScreenshotAsync(convService.ConversationId, path);
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/Functions/ScreenshotFn.cs b/src/Plugins/BotSharp.Plugin.WebDriver/Functions/ScreenshotFn.cs
new file mode 100644
index 00000000..78e7b270
--- /dev/null
+++ b/src/Plugins/BotSharp.Plugin.WebDriver/Functions/ScreenshotFn.cs
@@ -0,0 +1,29 @@
+namespace BotSharp.Plugin.WebDriver.Functions;
+
+public class ScreenshotFn : IFunctionCallback
+{
+    public string Name => "take_screenshot";
+
+    private readonly IServiceProvider _services;
+    private readonly IWebBrowser _browser;
+
+    public ScreenshotFn(IServiceProvider services,
+        IWebBrowser browser)
+    {
+        _services = services;
+        _browser = browser;
+    }
+
+    public async Task<bool> Execute(RoleDialogModel message)
+    {
+        var convService = _services.GetRequiredService<IConversationService>();
+
+        var webDriverService = _services.GetRequiredService<WebDriverService>();
+        var path = webDriverService.GetScreenshotFilePath(message.MessageId);
+
+        message.Data = await _browser.ScreenshotAsync(convService.ConversationId, path);
+        message.Content = "Took screenshot successfully";
+
+        return true;
+    }
+}
diff --git a/src/Plugins/BotSharp.Plugin.WebDriver/data/agents/f3ae2a0f-e6ba-4ee1-a0b9-75d7431ff32b/functions.json b/src/Plugins/BotSharp.Plugin.WebDriver/data/agents/f3ae2a0f-e6ba-4ee1-a0b9-75d7431ff32b/functions.json
index de0d201c..0232e7f1 100644
--- a/src/Plugins/BotSharp.Plugin.WebDriver/data/agents/f3ae2a0f-e6ba-4ee1-a0b9-75d7431ff32b/functions.json
+++ b/src/Plugins/BotSharp.Plugin.WebDriver/data/agents/f3ae2a0f-e6ba-4ee1-a0b9-75d7431ff32b/functions.json
@@ -37,6 +37,16 @@
       "required": [ "url" ]
     }
   },
+  {
+    "name": "take_screenshot",
+    "description": "Tak screenshot to show current page screen",
+    "parameters": {
+      "type": "object",
+      "properties": {
+      },
+      "required": []
+    }
+  },
   {
     "name": "click_button",
     "description": "Click a button in a web page.",