diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index dda2f6147f..6983259d55 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -63,6 +63,7 @@ namespace OpenSim.Grid.InventoryServer
 
         public bool CreateUsersInventory(LLUUID user)
         {
+            Console.WriteLine("Creating New Set of Inventory Folders for " + user.ToStringHyphenated());
             CreateNewUserInventory(user);
             return true;
         }
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index d3164ade15..1df4d9ad4d 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -30,6 +30,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Net;
+using System.Threading;
 using Nwc.XmlRpc;
 using libsecondlife;
 using OpenSim.Framework;
@@ -197,7 +198,14 @@ namespace OpenSim.Grid.UserServer
         protected override InventoryData CreateInventoryData(LLUUID userID)
         {
             List<InventoryFolderBase> folders = SyncRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_config.InventoryUrl + "RootFolders/", userID);
-            if (folders.Count > 0)
+            if (folders ==null | folders.Count == 0)
+            {
+                RestObjectPoster.BeginPostObject<LLUUID>(m_config.InventoryUrl + "CreateInventory/", userID);
+                Thread.Sleep(1000);
+                folders = SyncRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(m_config.InventoryUrl + "RootFolders/", userID);
+            }
+
+            if(folders.Count >0)
             {
                 LLUUID rootID = LLUUID.Zero;
                 ArrayList AgentInventoryArray = new ArrayList();