diff --git a/src/lockscreen.c b/src/lockscreen.c
index fee08279d758cb4dcc904fe94e9fda7fa16a70b8..9118f117078d25efdf69a20cd45bb1d3ad9e6764 100644
--- a/src/lockscreen.c
+++ b/src/lockscreen.c
@@ -67,12 +67,18 @@ static void
 keypad_update_labels (PhoshLockscreen *self)
 {
   PhoshLockscreenPrivate *priv = phosh_lockscreen_get_instance_private (self);
+  gint len;
+  gchar *pos;
   const gchar *number;
-  g_autofree gchar *stars = NULL;
+  g_autofree gchar *dots = NULL;
 
   number = hdy_dialer_get_number (HDY_DIALER (priv->dialer_keypad));
-  stars = g_strnfill (strlen(number), '*');
-  gtk_label_set_label (GTK_LABEL (priv->lbl_keypad), stars);
+  len = strlen (number);
+  dots = pos = g_malloc0 (len * 3 + 1);
+  g_return_if_fail (dots);
+  for (int i; i < len; i++)
+    pos = g_stpcpy (pos, "●");
+  gtk_label_set_text (GTK_LABEL (priv->lbl_keypad), dots);
   gtk_label_set_label (GTK_LABEL (priv->lbl_unlock_status), _("Enter PIN to unlock"));
 }
 
diff --git a/src/phosh.c b/src/phosh.c
index bbd9653ba216b414233a7efed5495a945d09e560..7f5115c312cafc7074b77f4f966a333ae9e53bcf 100644
--- a/src/phosh.c
+++ b/src/phosh.c
@@ -950,7 +950,7 @@ int main(int argc, char *argv[])
   GMainContext *context;
   GOptionContext *opt_context;
   GError *err = NULL;
-  gboolean unlocked;
+  gboolean unlocked = FALSE;
 
   const GOptionEntry options [] = {
     {"unlocked", 'U', 0, G_OPTION_ARG_NONE, &unlocked,