OOIION-1819: Fix facepage issues
Merge pull request #1988 from mmeisinger/fix1819_face

OOIION-1819: Fix facepage issues