diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f54bcc18d..e0dfdadf0 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -148,6 +148,8 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMa
   QMenu *lockMenu = new QMenu(this);
   QAction *defineUiLockPasswdAct = lockMenu->addAction(tr("Set the password..."));
   connect(defineUiLockPasswdAct, SIGNAL(triggered()), this, SLOT(defineUILockPassword()));
+  QAction *clearUiLockPasswdAct = lockMenu->addAction(tr("Clear the password"));
+  connect(clearUiLockPasswdAct, SIGNAL(triggered()), this, SLOT(clearUILockPassword()));
   actionLock_qBittorrent->setMenu(lockMenu);
   // Creating Bittorrent session
   connect(QBtSession::instance(), SIGNAL(fullDiskError(QTorrentHandle, QString)), this, SLOT(fullDiskError(QTorrentHandle, QString)));
@@ -412,6 +414,12 @@ void MainWindow::defineUILockPassword() {
   }
 }
 
+void MainWindow::clearUILockPassword() {
+  QMessageBox::StandardButton answer = QMessageBox::question(this, tr("Clear the password"), tr("Are you sure you want to clear the password?"), QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
+  if (answer == QMessageBox::Yes)
+    Preferences().clearUILockPassword();
+}
+
 void MainWindow::on_actionLock_qBittorrent_triggered() {
   Preferences pref;
   // Check if there is a password
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 8a813fe45..4c79ae762 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -107,6 +107,7 @@ protected slots:
   void tab_changed(int);
   void on_actionLock_qBittorrent_triggered();
   void defineUILockPassword();
+  void clearUILockPassword();
   bool unlockUI();
   void notifyOfUpdate(QString);
   void showConnectionSettings();
diff --git a/src/preferences/preferences.h b/src/preferences/preferences.h
index 452ab81c8..d8b0c9d20 100755
--- a/src/preferences/preferences.h
+++ b/src/preferences/preferences.h
@@ -923,6 +923,10 @@ public:
     setValue("Locking/password", md5_password);
   }
 
+  void clearUILockPassword() {
+    remove("Locking/password");
+  }
+
   QString getUILockPasswordMD5() const {
     return value("Locking/password", QString()).toString();
   }