#4993 For master
Merge pull request #5002 from dotCMS/issue-4993-Problems-after-login-master

#4993 For master