@zhkramer , fyi. We didn't get this non-activated student situation quite right before, so please take another look when I commit in a few minutes...