Password recovery UI
Merge branch 'recoverpass'