changed data model, fixed loginrequest