Added handling of private users