Fix login according  our app needs