Fix tokens to not pass sensitive info in payload
Fix to store encrypted passwords using promises