Feature/login fixing