Fix + add tests for retries for enter + create-pin (bug 1015351)