diff --git a/core/browser.py b/core/browser.py
index f8a3667..5094602 100644
--- a/core/browser.py
+++ b/core/browser.py
@@ -178,14 +178,17 @@ class BrowserView(QWebEngineView):
             self.buffer.message_to_emacs.emit("Successfully enabled adblocker!")
 
     @interactive()
-    def record_form_data(self):
+    def save_page_password(self):
         ''' Record form data.'''
-        self.buffer.add_password_entry()
-        self.buffer.message_to_emacs.emit("Successfully recorded form data!")
+        if self.buffer.emacs_var_dict["eaf-browser-enable-autofill"] == "true":
+            self.buffer.add_password_entry()
+            self.buffer.message_to_emacs.emit("Successfully recorded current page's password!")
+        else:
+            self.buffer.message_to_emacs.emit("Autofill is not enabled! Enable it with C-t")
 
     @interactive()
-    def toggle_autofill(self):
-        ''' Toggle Autofill status and data'''
+    def toggle_password_autofill(self):
+        ''' Toggle Autofill status for password data'''
         if self.buffer.emacs_var_dict["eaf-browser-enable-autofill"] == "false":
             self.buffer.set_emacs_var.emit("eaf-browser-enable-autofill", "true", "true")
             self.buffer.autofill_id = self.buffer.auto_fill(0)
diff --git a/eaf.el b/eaf.el
index 94ae290..922108b 100644
--- a/eaf.el
+++ b/eaf.el
@@ -7,7 +7,7 @@
 ;; Copyright (C) 2018, Andy Stewart, all rights reserved.
 ;; Created: 2018-06-15 14:10:12
 ;; Version: 0.5
-;; Last-Updated: Thu Aug  6 22:36:41 2020 (-0400)
+;; Last-Updated: Sat Sep 12 18:56:21 2020 (-0400)
 ;;           By: Mingde (Matthew) Zeng
 ;; URL: http://www.emacswiki.org/emacs/download/eaf.el
 ;; Keywords:
@@ -349,8 +349,8 @@ Try not to modify this alist directly.  Use `eaf-setq' to modify instead."
     ("M-f" . "history_forward")
     ("M-b" . "history_backward")
     ("M-q" . "clear_cookies")
-    ("C-t" . "toggle_autofill")
-    ("C-d" . "record_form_data")
+    ("C-t" . "toggle_password_autofill")
+    ("C-d" . "save_page_password")
     ("M-a" . "toggle_adblocker")
     ("C-M-q" . "clear_history")
     ("M-v" . "scroll_down_page")