Fixed dataaccess issues and login issues