diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index b8b4d51..56ee8df 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -76,6 +76,7 @@ void MainWindow::exit_diary_to_main_menu(bool const locked)
         GoogleWrapper::instance()->upload_diary([this, locked](const td::GWrapperError err) {
             InternalManager::instance()->diary_file_changed = false;
             GoogleWrapper::instance()->encrypt_credentials();
+            GoogleWrapper::instance()->google->unlink();
             Encryptor::instance()->reset();
             InternalManager::instance()->end_busy_mode(__LINE__, __func__, __FILE__);
 
@@ -102,6 +103,7 @@ void MainWindow::exit_diary_to_main_menu(bool const locked)
     }
     else {
         GoogleWrapper::instance()->encrypt_credentials();
+        GoogleWrapper::instance()->google->unlink();
         Encryptor::instance()->reset();
     }
 
diff --git a/src/gui/optionsmenu.cpp b/src/gui/optionsmenu.cpp
index 58e3db5..16cfcb8 100644
--- a/src/gui/optionsmenu.cpp
+++ b/src/gui/optionsmenu.cpp
@@ -164,6 +164,7 @@ void OptionsMenu::update_lock_timeout()
 
     InternalManager::instance()->settings->setValue("lock_timeout", ms);
     InternalManager::instance()->inactive_filter->interval = ms;
+    InternalManager::instance()->inactive_filter->timer->start();
 
     ui->lock_timeout_text->set_text("Lock timeout updated.");
 }
diff --git a/text/VERSION.txt b/text/VERSION.txt
index 3e3c2f1..eca07e4 100644
--- a/text/VERSION.txt
+++ b/text/VERSION.txt
@@ -1 +1 @@
-2.1.1
+2.1.2