Cleaned up user checking.