Fixes: #1294 Added OS and PUK number