diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..591fdfe
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,29 @@
+<!--
+PLEASE HELP US PROCESS GITHUB ISSUES FASTER BY PROVIDING THE FOLLOWING INFORMATION.
+-->
+
+## I'm submitting a…
+<!-- Please check one of the following options with "x" -->
+<pre>
+[ ] Bug
+[ ] Feature Request
+[ ] Other (Please describe in detail)
+</pre>
+
+## Current Behavior
+<!-- Describe the current behavior -->
+
+## Expected Behavior
+<!-- Describe the desired behavior you expect after mitigation of the issue -->
+
+## Reproduction Instructions
+<!--
+For bug reports, please provide detailed instructions on how the bug can be reproduced.
+For feature requests, you can remove this section.
+-->
+
+## Environment
+Output of `i3lock --version`:
+<pre>
+i3lock version: 
+</pre>
diff --git a/i3lock.c b/i3lock.c
index 73701c1..5afc643 100644
--- a/i3lock.c
+++ b/i3lock.c
@@ -680,6 +680,12 @@ static void handle_key_press(xcb_key_press_event_t *event) {
             return;
         default:
             skip_repeated_empty_password = false;
+            // A new password is being entered, but a previous one is pending.
+            // Discard the old one and clear the retry_verification flag.
+            if (retry_verification) {
+                retry_verification = false;
+                clear_input();
+            }
     }
 
     // backspace, esc, delete, etc