major user/passport reorganization