Changed the SQL query to include user in UserDAO