keystorage small fix + user module fixes