Minor fixes to UserProvider and DAO