Fixes for some issues being caused by Facebook integration

Helpdesk & facebook issue has been resolved