fixed User & UserDAO classes