SWC-1660: fix login forms so that Portal app is not re-initialized on login
Merge pull request #1213 from jay-hodgson/release-59

SWC-1660: fix login forms so that Portal app is not re-initialized on login
Merge branch 'release-59' into develop
Merge pull request #1214 from jay-hodgson/develop

merge from release-59