Improve enterPasswordActivity and clean up