partial Fix login