Fixed portal issues
Merge pull request #53 from MuttStudio/feature/ps-fix

[Feature] Fix portal issues