[CLC-2087] Getting redirected to the settings page every time!

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-2087