Feature/17 login issue