Merging password recovery work