Resolve Password issues