CLC-1931 - Make Act_As more in-your-face to avoid any mishaps
https://jira.media.berkeley.edu/jira/browse/CLC-1931
Merge pull request #1548 from christianv/CLC-1931

CLC-1931 - Make Act_As more in-your-face to avoid any mishaps