Added generic user account support