Password recovery UI
Resolve merge conflict with MainActivity