WIP: Improve reset-password fn