Adds forgotten_password feature
Fix merge