updates to admin and User class