Fix dumb typo causing all my pain
Remove hardcoded UID
Merge branch 'OSSAP-7.x' of github.com:openscholar/ossap into OSSAP-7.x