Fixed unsuccessfuly previous fix for broken assessment section links
Minor fix.
Protected against unecessary external user icon retrieval.
Merge branch 'master' into i18n