FIX: #500f2a0c Store key instedad of password