Fix for null currentUser related to auto-login