Code Clean up for lost password