Added password recovery email functionality
resolve conflict