Another rework for login