Added user/nonuser functionality