Added Account Recovery
Todo: redirections and optimizations