diff --git a/i3lock.c b/i3lock.c
index d971f0d..4c52e30 100644
--- a/i3lock.c
+++ b/i3lock.c
@@ -59,6 +59,8 @@ static bool beep = false;
 bool debug_mode = false;
 static bool dpms = false;
 bool unlock_indicator = true;
+bool capslock_active = false;
+bool numlock_active = false;
 static bool dont_fork = false;
 struct ev_loop *main_loop;
 static struct ev_timer *clear_pam_wrong_timeout;
@@ -277,6 +279,11 @@ static void input_done(void) {
     if (debug_mode)
         fprintf(stderr, "Authentication failure\n");
 
+    /* Get state of Caps and Num lock modifiers, to be displayed in
+     * STATE_PAM_WRONG state */
+    capslock_active = xkb_state_mod_name_is_active(xkb_state, XKB_MOD_NAME_CAPS, XKB_STATE_MODS_EFFECTIVE);
+    numlock_active = xkb_state_mod_name_is_active(xkb_state, XKB_MOD_NAME_NUM, XKB_STATE_MODS_EFFECTIVE);
+
     pam_state = STATE_PAM_WRONG;
     failed_attempts += 1;
     clear_input();
@@ -327,7 +334,7 @@ static void handle_key_press(xcb_key_press_event_t *event) {
     bool composed = false;
 
     ksym = xkb_state_key_get_one_sym(xkb_state, event->detail);
-    ctrl = xkb_state_mod_name_is_active(xkb_state, "Control", XKB_STATE_MODS_DEPRESSED);
+    ctrl = xkb_state_mod_name_is_active(xkb_state, XKB_MOD_NAME_CTRL, XKB_STATE_MODS_DEPRESSED);
 
     /* The buffer will be null-terminated, so n >= 2 for 1 actual character. */
     memset(buffer, '\0', sizeof(buffer));
diff --git a/unlock_indicator.c b/unlock_indicator.c
index f1cdfb4..8834f00 100644
--- a/unlock_indicator.c
+++ b/unlock_indicator.c
@@ -9,6 +9,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <math.h>
 #include <xcb/xcb.h>
 #include <ev.h>
@@ -44,6 +45,10 @@ extern uint32_t last_resolution[2];
 /* Whether the unlock indicator is enabled (defaults to true). */
 extern bool unlock_indicator;
 
+/* Whether the capslock and numlock mods are active or not. */
+extern bool capslock_active;
+extern bool numlock_active;
+
 /* A Cairo surface containing the specified image (-i), if any. */
 extern cairo_surface_t *img;
 
@@ -229,6 +234,29 @@ xcb_pixmap_t draw_image(uint32_t *resolution) {
             cairo_close_path(ctx);
         }
 
+        if (pam_state == STATE_PAM_WRONG && (capslock_active || numlock_active)) {
+            cairo_text_extents_t extents;
+            double x, y;
+            char *lock_text = NULL;
+
+            if (asprintf(&lock_text, "%s%s%s locked",
+                        capslock_active ? "Caps" : "",
+                        capslock_active && numlock_active ? ", " : "",
+                        numlock_active ? "Num" : "") != -1) {
+                cairo_set_font_size(ctx, 14.0);
+
+                cairo_text_extents(ctx, lock_text, &extents);
+                x = BUTTON_CENTER - ((extents.width / 2) + extents.x_bearing);
+                y = BUTTON_CENTER - ((extents.height / 2) + extents.y_bearing) + 28.0;
+
+                cairo_move_to(ctx, x, y);
+                cairo_show_text(ctx, lock_text);
+                cairo_close_path(ctx);
+
+                free(lock_text);
+            }
+        }
+
         /* After the user pressed any valid key or the backspace key, we
          * highlight a random part of the unlock indicator to confirm this
          * keypress. */