Refactor ID to Password