Another little fixes (+1 squashed commit)
Squashed commits:
[2617baf] Fix when user doesn't have valid keys.