users and sessions fixed