Improved password recovery feature