Add ROLE_PREVIOUS_ADMIN to allow switch back
Merge pull request #1609 from amenophis/switch-user-bugfix

Add ROLE_PREVIOUS_ADMIN to allow switch back