diff --git a/src/MusicStore/Controllers/CheckoutController.cs b/src/MusicStore/Controllers/CheckoutController.cs
index a7cffc1f5d..922749dd43 100644
--- a/src/MusicStore/Controllers/CheckoutController.cs
+++ b/src/MusicStore/Controllers/CheckoutController.cs
@@ -46,7 +46,7 @@ namespace MusicStore.Controllers
                         : 1;
 
                     order.OrderId = nextId;
-                    order.Username = this.Context.User.Identity.Name;
+                    order.Username = this.Context.User.Identity.GetUserName();
                     order.OrderDate = DateTime.Now;
 
                     //Add the Order
@@ -78,7 +78,7 @@ namespace MusicStore.Controllers
             // Validate customer owns this order
             bool isValid = db.Orders.Any(
                 o => o.OrderId == id &&
-                o.Username == this.Context.User.Identity.Name);
+                o.Username == this.Context.User.Identity.GetUserName());
 
             if (isValid)
             {
diff --git a/src/MusicStore/Views/Shared/_LoginPartial.cshtml b/src/MusicStore/Views/Shared/_LoginPartial.cshtml
index a263e9b5e4..31e33e84ed 100644
--- a/src/MusicStore/Views/Shared/_LoginPartial.cshtml
+++ b/src/MusicStore/Views/Shared/_LoginPartial.cshtml
@@ -1,4 +1,6 @@
-@using Microsoft.AspNet.Identity;
+@*This using statement to MusicStore.Controllers should go away once we have the GetUserName() extension on IIdentity in some Identity package*@
+@using MusicStore.Controllers
+@using Microsoft.AspNet.Identity;
 
 @if (Context.HttpContext.User != null && Context.HttpContext.User.Identity.IsAuthenticated)
 {
@@ -8,7 +10,7 @@
 
         <ul class="nav navbar-nav navbar-right">
             <li>
-                @Html.ActionLink("Hello " + Context.HttpContext.User.Identity.Name + "!", "Manage", "Account", routeValues: null, htmlAttributes: new { title = "Manage" })
+                @Html.ActionLink("Hello " + Context.HttpContext.User.Identity.GetUserName() + "!", "Manage", "Account", routeValues: null, htmlAttributes: new { title = "Manage" })
             </li>
             <li><a href="javascript:document.getElementById('logoutForm').submit()">Log off</a></li>
         </ul>