diff --git a/web/ChangeLog b/web/ChangeLog
index 0d8171b0..95159c4d 100644
--- a/web/ChangeLog
+++ b/web/ChangeLog
@@ -1,3 +1,13 @@
+2015-06-12  Paul Schneider  <paul@pschneider.fr>
+
+	* AccountController.cs: Code formatting
+
+	* Web.csproj: cleanning
+
+	* Web.config: Yavsc.Model.Circles in imported namespaces
+
+	* Circles.aspx: Allow Circle view to handle null model
+
 2015-06-12  Paul Schneider  <paul@pschneider.fr>
 
 	* Web.csproj:
diff --git a/web/Controllers/AccountController.cs b/web/Controllers/AccountController.cs
index c9c212a6..c392f2d3 100644
--- a/web/Controllers/AccountController.cs
+++ b/web/Controllers/AccountController.cs
@@ -297,7 +297,9 @@ namespace Yavsc.Controllers
 		[Authorize]
 		public ActionResult Circles ()
 		{
-			return View (CircleManager.DefaultProvider.List (Membership.GetUser().UserName));
+			string user = Membership.GetUser ().UserName;
+			CircleInfoCollection cic = CircleManager.DefaultProvider.List (user);
+			return View (cic);
 		}
 		/// <summary>
 		/// Logout the specified returnUrl.
diff --git a/web/Views/Account/Circles.aspx b/web/Views/Account/Circles.aspx
index e72c46a7..5d3ff68c 100644
--- a/web/Views/Account/Circles.aspx
+++ b/web/Views/Account/Circles.aspx
@@ -4,11 +4,15 @@
 <asp:Content ID="headContent" ContentPlaceHolderID="head" runat="server">
 </asp:Content>
 <asp:Content ID="MainContentContent" ContentPlaceHolderID="MainContent" runat="server">
-<% foreach (CircleInfo ci in model) { %>
+<% if (Model==null) { %>
+No circle yet
+<% } else { %>
+
+<% foreach (CircleInfo ci in Model) { %>
  <%= ci.Title %>
  <%= ci.Id %>
  <br/>
-<% } %>
+<% }} %>
 </asp:Content>
 <asp:Content ID="MASContentContent" ContentPlaceHolderID="MASContent" runat="server">
 </asp:Content>
diff --git a/web/Views/Web.config b/web/Views/Web.config
index 2b135949..e420d020 100644
--- a/web/Views/Web.config
+++ b/web/Views/Web.config
@@ -29,6 +29,7 @@
 				<add namespace="Yavsc.Model.WorkFlow" />
 				<add namespace="Yavsc.Model.Google" />
 				<add namespace="Yavsc.Model.FrontOffice" />
+				<add namespace="Yavsc.Model.Circles" />
 
 			</namespaces>
 		</pages>
diff --git a/web/Web.csproj b/web/Web.csproj
index 0d9b906b..37fabb6e 100644
--- a/web/Web.csproj
+++ b/web/Web.csproj
@@ -126,7 +126,6 @@
     <Folder Include="Views\PayPal\" />
     <Folder Include="ApiControllers\" />
     <Folder Include="Views\Modules\" />
-    <Folder Include="Views\Circle\" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controllers\HomeController.cs" />