Admin and user side fixes