Revert "Currently we have a bug when a user isn't logged in"

This reverts commit a42c9cfda247457dca5d97caa7bad7bab9cc4071.
Proper fix for the toUpperCase error