Recovery codes and resolves bug saving options Edit

- Recovery codes
- Last commit resolves bug that logouts when we save options