Aligned usercheck on all scripts