Simplified logic around determining if user is authenticated to make int...

...ention of code more clear

I think this makes it easier to understand what's happening by flipping the else if to just else.

JOINDIN-230