CYB-163 - Fix the current_user code.

The code as it did exist was causing issues, this code works.

Documented in [CYB-163](https://jira.ets.berkeley.edu/jira/browse/CYB-163)