Fix Smarty White Page of Doom Error on Login
Merge pull request #606 from sinfuljosh/dev

Fix Smarty White Page of Doom Error on Login
Merge pull request #607 from nZEDb/dev

Dev