diff --git a/scd/app-p15.c b/scd/app-p15.c
index 4ace34d02..2bdcb1577 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -5145,7 +5145,6 @@ verify_pin (app_t app,
   switch (aodf->pintype)
     {
     case PIN_TYPE_BCD:
-    case PIN_TYPE_ASCII_NUMERIC:
       for (s=pinvalue; digitp (s); s++)
         ;
       if (*s)
@@ -5154,6 +5153,15 @@ verify_pin (app_t app,
           err = gpg_error (GPG_ERR_BAD_PIN);
         }
       break;
+    case PIN_TYPE_ASCII_NUMERIC:
+      for (s=pinvalue; *s && !(*s & 0x80); s++)
+        ;
+      if (*s)
+        {
+          errstr = "Non-ascii characters found in PIN";
+          err = gpg_error (GPG_ERR_BAD_PIN);
+        }
+      break;
     case PIN_TYPE_UTF8:
       break;
     case PIN_TYPE_HALF_NIBBLE_BCD: