Important fixes for proper User loading