added logins to model
fixed merge