Add option to prompt for PIN even if specified (bug #3489)