diff --git a/src/gui/Clipboard.cpp b/src/gui/Clipboard.cpp
index 7f020f7d3..3d0292c0e 100644
--- a/src/gui/Clipboard.cpp
+++ b/src/gui/Clipboard.cpp
@@ -55,7 +55,7 @@ void Clipboard::setText(const QString& text)
     if (config()->get("security/clearclipboard").toBool()) {
         int timeout = config()->get("security/clearclipboardtimeout").toInt();
         if (timeout > 0) {
-            m_timer->start(timeout);
+            m_timer->start(timeout * 1000);
         }
     }
 }
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 6e4c0686c..399b1b008 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -292,7 +292,6 @@ void DatabaseWidget::copyUsername()
         return;
     }
 
-    // TODO: set clearTimeout
     clipboard()->setText(currentEntry->username());
 }
 
@@ -304,7 +303,6 @@ void DatabaseWidget::copyPassword()
         return;
     }
 
-    // TODO: set clearTimeout
     clipboard()->setText(currentEntry->password());
 }