Cleaned up role handling. Now setting default roles for new user.