Fixed Bug #7139
-Follow up for the Pincode Feature.

Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>